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

* commit 'db30124ab6dabd8e24789efaa4e6db7622889b87':
  Revert "Play the video on top of lock screen"