Merge "Fix for Binder one-way deadlock." into rvc-dev