Bug 841977 - Show track number instead of index. Also disc number if relevant.

Includes dependencies that have to land before this. ie will be rebased when time comes.
uh oh, the triviality of checking after the sort escaped me....