am e074fcbd: Merge "Hide zoom view when back is pressed" into gb-ub-photos-carlsbad

* commit 'e074fcbdb7d7bb20dde8173b969cbbafb53b92a9':
  Hide zoom view when back is pressed