Merge "Change sort order of modes list" into main