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

Change-Id: Id17634723fd1fce94cd62f29322a23c5f67dda89