am 26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryce

* commit '26e3c48b831e39ced1db18673f12fb3c7a2d56d8':
  Disable zoom