Merge "Migrate PackageSetting usages to PackageStateInternal"