am 197e238d: Merge "moving m*Animator.end() out of onConfigurationChanged" into gb-ub-photos-denali

* commit '197e238d3ccd2c758238f1bce27687644c4d0521':
  moving m*Animator.end() out of onConfigurationChanged