Merge "[pm] correctly lock/unlock mInstallLock" into main