Merge "PackageManager: Avoid null access"