Merge "Make sure mark_idle job run before write_back jobs"