Merge "Copy over PkgState in PackageSetting updateFrom" into rvc-dev