Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread