am 1fdac7a8: (-s ours) am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev

* commit '1fdac7a859416da43db49a7b65c487b53f9c5350':