Merge "Create surfacecontrol before layout in relayoutWindow" into sc-dev