am d7d14033: am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev

* commit 'd7d14033af438b88053454e7d73c1689eaa77c35':
  Revert "Do not forceLayout when window is resized"