Refactor listenFD function Upstream-commit: caf7d83c676857243629d1c60fd4def158675b6b Component: engine