Merge "Create surfacecontrol before layout in relayoutWindow"