Merge "Fix the SettingsView so it shows again."