Merge "Fix of Settings application sort crash"