Merge "Fix to display merge icon on failure."