Merge "Changed the haptics for back edge swipe gesture"