[release-1.15] Improve scheduler memory usage and remove scheduler waits to speed up recovery time#8202