Merge "Fix old issue with compatibility-scaled apps and Animations"