Merge "Fix bind_keyguard_media_visibility" into main