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

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