Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread