Rx: make conn_call_lock and conn_data_lock usage consistent