Change default minimum gesture duration to 0.33 from 0.5, code re-ordering