Merge "Update layout margin of SettingsSpinnerPreference." into main