Merge "Cleanup the SipDelegates associated with an app if it dies"