Merge "Fix FD ownership for local FileSource" into rvc-dev