Merge "Revert "Create surfacecontrol before layout in relayoutWindow""