Refs #20947; Fixed sort for simple small multiples
Merge remote-tracking branch 'upstream/master'