Make sure one extra track is always added for the playlist, TODO: Add for shuffle/repeat