Merge "Differentiate the edge sensitivity from the edge panel size"