Merge changes from topic "expose-call-forward"

* changes:
  Rename call forwarding related constants
  Update the call forwarding/waiting APIs