FLEX-33159 FLEX-33158 Fix addSortField method so it preserves custom sorting and keeps internal sort fields in sync