Merge "Ensure pinned animation scaling is consistently applied." into nyc-dev