Fix to display merge icon on failure.

Trigger a state change to incallui with the existing state
on an unsuccessful merge in order to enable merge icon.

Change-Id: I6bb3a151f27e38cf788cb148ce61005b62cb8e2b
CRs-Fixed: 815642
5 files changed