Merge "Expose and update the call forward/waiting APIs"