Merge branch 'tracklist-provider' into fix/handle-stream-metadata
Merge branch 'tracklist-provider' into fix/handle-stream-metadata
Accidental addition of later PR
Merge with tracklist-provider
Merge branch 'fix/handle-stream-metadata'