Merge "Shows ripple effect for SettingsSpinnerPreference" into sc-dev