Merge "If an icon add remove get coalesced, don't remove some other icon." into gingerbread