Merge "Disconnect calls from other CS when hanging over to a self-mgd CS." into oc-mr1-dev