Merge "Fix Notifications SettingsRoboTests" into main