Merge changes from topic "am-61817d991ed7435bac101765b24448c5"

* changes:
  [automerger skipped] Merge "Add placeholder when media control title is blank" into sc-v2-dev am: 7a18989c -s ours am: 642fc490 -s ours am: 427bc0c9 -s ours am: b3eeadcc -s ours am: f83bad28 -s ours am: d2882d9a -s ours am: 4e447929 -s ours
  [automerger skipped] Add placeholder when media control title is blank am: df4686dc -s ours am: 43a6d0e2 -s ours am: 9c47a9ad -s ours am: abd594af -s ours am: 54e3d50f -s ours am: 80035bf1 -s ours am: ec6a5e92 -s ours