Merge \"Ensure pinned animation scaling is consistently applied.\" into nyc-dev
am: b99e19c729

Change-Id: Ibe2acdd30d3354759df589c1bb312e50640cfc16