am 48d6492c: Merge "Best effort fix to prevent stretched videos." into gb-ub-photos-denali

* commit '48d6492ccc56cb7d62a30ecc1f8576dc44e25718':
  Best effort fix to prevent stretched videos.