Merge "[pm] add deDataInode in PackageUserState" into main