am 09d569a5: Merge "Fix invalidation roundoff error with old animations"

* commit '09d569a57e7c8f3d8d6a5f2204643988ae36e07c':
  Fix invalidation roundoff error with old animations