am 2b2d313e: Merge "Reduce amount of invalidation when old-style animations...
am 2b2d313e: Merge "Reduce amount of invalidation when old-style animations are running" into klp-dev
* commit '2b2d313e':
Reduce amount of invalidation when old-style animations are running