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

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