Merge "Consolidate the starting surface icon size to framework" into sc-dev