Merge "Fix freeform window resizing."