Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev