Merge "Catch NPE when reportInstallationStats" into main