Resolve "Clicking on Play Next or add to queue restarts current song" Closes #464 See merge request !400