am 717bfa1e: Merge changes I0295e9d6,Ib0bb7ab2 into klp-dev

* commit '717bfa1e73083320be0755873b47a3c67bad0342':
  Send mute state to UI.
  Stop overwriting CALL_WAITING with INCOMING