Merge "Move WS insets into WindowFrames"