Merge "Revert "Play the video on top of lock screen"" into gb-ub-photos-carlsbad