Merge "TableSorter: Fix column order when collecting headers"