Tweak next track behaviour of repeat album mode:
If a track is at the end of the playlist and there are others from the album, enable skip.
If there is just one track from an album, treat it like repeat track mode.