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

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