Merge "[pm] reset ArchiveState on package update/re-install" into main