Bug 1037371 - Use Notification events handler
Merge pull request #21622 from lissyx/bug1037371

Bug 1037371 - Use Notification events handler r=alive,mhenretty