Merge "Fix deadlock in cuttlefish/default implementation" into rvc-dev