When looking up metadata for Deezer/Rhapsody, don't forget to add the
trackId which triggered the lookup.
Merge branch 'public/7.7' into public/7.8