Merge "sched: Improve the scheduler"