Merge "[pm] preserve new fields added in PackageSetting" into main