am 3493ba2a: Merge "Preserve high resolution image on touch during zoom" into gb-ub-photos-carlsbad

* commit '3493ba2a0a2e91a093c5fddad60bc1f1e56b91b5':
  Preserve high resolution image on touch during zoom