Merge "Improve Animation Calculations to remove Jank" into nyc-dev
am: 0322c5f

* commit '0322c5f8beb7e1171ab793d3fb08c50951dcda84':
  Improve Animation Calculations to remove Jank

Change-Id: I59f98bad2138af25397a33e2243c6d53c8685b37