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

Change-Id: I8a656962d487171506daf42d5fb9e83b58c720d3