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