Merge "Let SettingsSpinnerAdapter support generic type"