Merge "Fix file descriptor ownership." into rvc-dev