Improve query-scheduler performance under load (#5880)

Improve query-scheduler performance under load (#5880) #2396