Merge "Fix for edge swipe/fling to minimize"