Merge "End animations on scrap views, clear updated views from cache" into lmp-mr1-ub-dev