am 2b8801dd: Merge "Handle back key after video playback" into gb-ub-photos-bryce

* commit '2b8801ddd616080d4be9afacca67584840d0b849':
  Handle back key after video playback