Issue #2373287 by estha: Add timeout to visitor context promises.