Bug 841977 - Part 1.1: address comments from Part 1.
Bug 841977 - Part 2: Show track number instead of index. Also disc number if relevant.
Bug 841977 - Part 3: added marionette tests