Merge "SipService: handle connectivity changes correctly."