Merge "sched: improve the scheduler" into msm-4.9