Merge "Properly support multi-user in NotificationSettingsRepository" into main