Merge "sched: improve the scheduler"