Merge "Update the call forwarding/waiting APIs"