Merge "Fix the missing lock in onPackageDataCleared()" into main