Merge "Fixed an issue where the keyguard media visibility was wrong" into sc-dev