* commit 'f4197bf93532b333dbea13792c422b65b0ceebf3': Fix 6395288: Added lock to avoid unbind race condition