Merge change 8688

* changes:
  Fix the issue of new call failing in 3-way call scenario.