Merge "Double-check SIP state before issuing a swap-calls command."