Merge "Merge "Improved the haptic feedback for the edge swipe gesture" into qt-dev am: c2180f475d am: e3d2585b67"