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

Change-Id: I65df5be2f3cabe12d1387ccc07f54e9c7c74358f