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

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