Bug 1036368 - Javascript errors when icons are removed while they are being decorated
Merge pull request #21535 from crdlc/bug-1036368

Bug 1036368 - Javascript errors when icons are removed while they are be...