Bug 1037371 - Use Notification events handler