Merge "Unhold other call after local disconnect of active call" into nyc-dev