Clear timeout in multi-press keyboard shortcuts.

This fixes #5038

Tests to follow in later testing PR.