Merge "Fixing animation regression due to ag/957220." into nyc-dev