Merge "Reduce amount of invalidation when old-style animations are running" into klp-dev