Fix bad merge in SettingsView, refs T317