Merge "Revert "Don't call epoll_wait with zero timeout unless watching FDs"" into main