Merge "Work around NPE in onPackageUninstalled()." into main