Merge "PackageSetting now owns its PackageUserState" into sc-dev