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

* commit 'd5b329e5aed07ffdd7cf0ba6e2aa100316d1bda8':
  Force layout and animation when display changes