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