gestures: fix disambiguation between two finger pinch and scroll

The changes introduced in b5b6f835 to add support for hold gestures introduced a regression:

The mechanism that was in place to improve the disambiguation between two finger pinch and scroll during the beginning of the gesture stopped working and instead a bug warning was printed on the log.

Fix the regression and document the disambiguation mechanism in the gesture state machine diagram.

Fix #726 (closed)