Merge "Tweak SettingsSpinner UI" into sc-dev