Merge "Cancelling touch interaction on multi-touch event" into ub-launcher3-qt-dev
am: 95b81c3e55

Change-Id: Ic87605da36caa6da9da730a569222b998e7af4ba