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