Merge "Fix 6395288: Added lock to avoid unbind race condition" into jb-dev