Merge "Only spawn one binder thread for cmd." into oc-dev