Merge "Partial revert "Wait for unlock to start jobs."" into sc-qpr1-dev