fdo#84000: Sort out problems with short timeouts & long callbacks.

Previously, the timer events could have accumulated in that scenario leading
to unresponsiveness to user events.

Change-Id: I455d726ae7475f7dbf98d871c54d8c156cb64e52