Merge changes from topic "am-d6ea5ee0f04e4cc4aee0e574e914d3bc" into main

* changes:
  [automerger skipped] Merge "Update media_controls_lock_screen setting behavior" into tm-qpr-dev am: 855e2a7f -s ours am: e2b7bff3 -s ours am: 4bc5c4c2 -s ours
  [automerger skipped] Update media_controls_lock_screen setting behavior am: 06e0a7b6 -s ours am: a52ef69a -s ours am: 4fa1ec34 -s ours