Fix zero timeout for watch-polling (high cpu usage).