Merge "Fix issues catching up to touch events after a short pause." into klp-dev