Merge "Avoid system crash because null AndroidPackage" into main