Merge "Fix job preemption logic"