Merge changes from topic "am-ec4d17ab8f6b4d7a96d30d3adab616e3" into main

* changes:
  [automerger skipped] Merge "Update media visibility on lock screen" into sc-v2-dev am: cd94c987 -s ours am: 2b60c4fc -s ours am: ed458d82 -s ours am: 27bfa812 -s ours am: 626cebc0 -s ours am: 2bdfef1f -s ours
  [automerger skipped] Update media visibility on lock screen am: 58fea4b8 -s ours am: 4109578c -s ours am: 899b56e4 -s ours am: b3e99345 -s ours am: 52170691 -s ours am: 731b6619 -s ours