Merge "Dismiss all layout updates." into lmp-dev