Merge "Listen for media lockscreen setting in background" into main