Merge "Improve PackageManager snapshot statistics" into sc-dev