Merge "Extract StartingSurface interface on WMShellBaseModule(7/N)" into sc-dev