am 31d7235b: am d5b329e5: Merge "Force layout and animation when display changes" into lmp-dev

* commit '31d7235bde390190b7751df744871b6dad2c87e8':
  Force layout and animation when display changes