Bug 855165 - Migrate to new Notification API and close notifications