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

* commit '8a1422f3422177490f7e36bd93537108392cb3dd':
  End animations on scrap views, clear updated views from cache