The TODO was to move from sending EXTRA_SONG to sending EXTRA_PLAYLIST_ENTRY but that may not be necessary. Removed TODO.