Merge "sched/fair: Only strict skip for current task"