Merge "SipSession: make potential time-consuming ops run on background thread" into gingerbread