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