Merge "Force windows to be scalable during pinned animation." into nyc-dev