am 0dff7ce1: Merge "Reset zoom view when user exits app or rotate device" into gb-ub-photos-carlsbad

* commit '0dff7ce1f701816b4a634b612bcaaaae6de0da34':
  Reset zoom view when user exits app or rotate device