Cherrypicking TracklistProvider changes for the branch