Roon programmers, please, for the love of all that is holy, make shuffle persist only for the length of the queue that is playing when shuffle is turned on (including any tracks that may be added while the queue is still playing). That is, once the queue is exhausted, turn shuffle off.
Better yet have a parameter that lets the customer choose how he wants shuffle to act.