Merge "Adjust the height of MainSwitchPreference" into main