Merge "Improve Animation Calculations to remove Jank" into nyc-dev