Merge "Revert "Use async approach to change sched policy""