Correcting flake error on unused import
Merge branch 'tidy-up-core' into tracklist-provider
Merge branch 'tracklist-provider' into fix/handle-stream-metadata