Now Playing addon marks the wrong song as playing now

So to reproduce, one needs to create a list to play in the now playing addon, play any song from it and then clear the list. Here's where it begins to not make sense. Songbird doesn't stop playing even though there are no songs to play.

The bug is If you drag and drop songs including the song that is currently playing, sometimes it will put the "now playing icon (speaker)" next to the first song rather than the song that is now playing. Sometimes it just won't put the now playing icon in the list at all even though its playing a song on the list.

One suggestion to fix this would be to just stop playback if someone clears the list. It seems that if there is nothing to play it should just stop instead of continuing playback of the last song.