Merge "Do not forceLayout when window is resized"