Merge "Check for NameNotFoundException when querying for PackageInfo" into main