Merge changes from topic "am-1425b752ce764c1e90c85bd45505d220"

* 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: bd7d0f30 -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: c82c03cd -s ours