Trackster: only sort amongst tracks and groups, not other items.
Automated merge of stable branch