Merge "Fix locking mPackages instead of correct mLock"