Merge "Increase threshold for gesture detection timeout" into nyc-dev