Bug 796305 - Part 2: sort album sublist by track number.
Bug 841977 - Show track number instead of index. Also disc number if relevant.