Merge "Make NotificationSettingsRepository hold individual settings." into main