Merge "Update media_controls_lock_screen setting behavior" into tm-qpr-dev