Merge "SipService: fix thread/socket leak" into gingerbread