Merge "Improved the haptic feedback for the edge swipe gesture" into qt-dev