Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread