base

If an icon add remove get coalesced, don't remove some other icon.

Also adds a test case and turns off the extra logging we added to debug this.

Change-Id: I8640938ae4d1e75c88213177888f363e05ce0fa0