WIP: Bug 938541 - Convert NotificationHelper to new API