Merge "TAPL: adding 1 to gesture margins to avoid accidentally triggering back" into ub-launcher3-qt-r1-dev