[BUGFIX] Ensure that hungup calls and merged dials can split/rejoin properly