Merge "Touch slop added to double tap detection"