Merge "PackageManager lock reduction utilities"