Merge "Add reportSafetySourceError/notification test"