Merge "Update media visibility on lock screen" into sc-v2-dev