Merge "Make job startup timeout similar to base OS service launch timeout"