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

* commit '1719817211743cabf53e06761ad5540518544273':