am bae5621a: am 4b20b031: Merge "Avoid invalidating view during some outline invalidations" into lmp-dev

* commit 'bae5621a7d9a60e16ff1ac7b3a5c4be06dec2305':
  Avoid invalidating view during some outline invalidations