Merge "Properly set the tap down time when entering non-tap modes"