am 6fa4de3c: Merge "If an icon add remove get coalesced, don\'t remove some...
am 6fa4de3c: Merge "If an icon add remove get coalesced, don\'t remove some other icon." into gingerbread
Merge commit '6fa4de3c' into gingerbread-plus-aosp
* commit '6fa4de3c':
If an icon add remove get coalesced, don't remove some other icon.