Merge "Move ServiceConnector job timeouts to the job handler thread"