Merge "Fix invalidation roundoff error with old animations"