Merge "Avoid invalidating view during some outline invalidations" into lmp-dev