Merge "Revert "Default shell_starting_surface to true to match platform behavior."" into sc-dev