Merge "DO NOT MERGE Double-check SIP state before issuing a swap-calls command." into mnc-dr-dev