core: Adding check in addition of tracks
Merge branch 'tracklist-provider' into fix/handle-stream-metadata