Merge "Replace SettingsSpinner with Spinner"