Merge "Increased the edge sensitivity for back to 24dp" into qt-dev