Merge "Fix lock inversion in PackageInstaller." into lmp-dev