Merge changes I0295e9d6,Ib0bb7ab2 into klp-dev

* changes:
  Send mute state to UI.
  Stop overwriting CALL_WAITING with INCOMING