Merge "Address drag unreliability during touch exploration"