Merge changes from topic "expose-call-forward"

* changes:
  Move some of the call-forwarding related constants
  Expose and update the call forward/waiting APIs