Merge "PackageManager: Avoid null access" into pi-dev