am e5ba601d: Merge "Bring back video snapshot" into gb-ub-photos-denali

* commit 'e5ba601d4e3aa9419886e2ea4b3b2e5ba3d3e2e7':
  Bring back video snapshot