Merge changes from topic "am-d6ea5ee0f04e4cc4aee0e574e914d3bc" into main

* changes:
  [automerger skipped] Merge "Update media_controls_lock_screen setting behavior" into tm-qpr-dev am: 855e2a7f8e -s ours am: e2b7bff307 -s ours am: 4bc5c4c216 -s ours
  [automerger skipped] Update media_controls_lock_screen setting behavior am: 06e0a7b620 -s ours am: a52ef69ae8 -s ours am: 4fa1ec3405 -s ours