Prep work for the upcoming patch to extend the timeout for tap-and-drag. And switch the tests that rely on it over to the new function. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>