Merge "Improve ScopedFd API"