Merge "Ensure animator's interpolator is set" into nyc-dev