Merge "Bring back touch events for double tap and double tap and hold."