Merge "Accounts for PackageSetting.pkg == null"