Bug 972475 - [System] Fix removal of event listener.
Merge pull request #16255 from desaintmartin/972475

Bug 972475 - [System] Fix removal of event listener.r=alive