Merge "Reduce lock contention in the package manager dump" into sc-dev