Merge changes from topic "am-c8c023474fdb4de0b3604a28e818569a" into main

* changes:
  [automerger skipped] Merge "Update media visibility on lock screen" into sc-v2-dev am: cd94c9876a -s ours am: 2b60c4fcd8 -s ours am: ed458d8258 -s ours am: 27bfa81263 -s ours am: 9bc7f3b98a -s ours
  [automerger skipped] Update media visibility on lock screen am: 58fea4b8b8 -s ours am: 4109578c7e -s ours am: 899b56e492 -s ours am: b3e993456f -s ours am: 97142159fa -s ours