Merge "[pm] use snapshot instead of deep-copy of PackageUserState"