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: I1c7baa7a2c2ccf277eff06d68da0b419ae587a19
CRs-Fixed:  815642
4 files changed