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

Change-Id: I1c2a4e15444eed8bb2604bbe4ca2a0401d75a6c6