Merge "Fix race condition in binder thread" into oc-dr1-dev