Merge "Use unique_fd::ok() instead of -1 comparison" into main