Merge "Restart SipService if it crashes" into nyc-dev