Merge "Catch NPE when reportInstallationToSecurityLog" into main