Clear shuffled id list on queue clear (#2192)