[Do Not Merge] Fix track ordering to be alphabetic