Merge "Introduce WindowProviderService" into sc-dev