Merge "Ensure no starting window leak in WMShell before adding." into sc-dev