Merge "Fix potential deadlock in unregisterStaleHandlers()" into lmp-dev