Merge "Remove above divider of main switch" into sc-dev