Merge "Partial revert "Wait for unlock to start jobs.""