Merge "Fix WindowProviderService test on instant mode" into sc-v2-dev