Merge "Fix fd leak in KeepaliveTracker." into rvc-d1-dev