Merge "Avoid double triggering assistant gesture haptic" into ub-launcher3-qt-dev
am: fcfac8156d

Change-Id: Ic3b5b77441e04ff45f6f97f9f3824d8577ed7665