respect disabling of default sort control
Merge remote-tracking branch 'theme-globals/master'