Merge "bug 3126 - shift to new notification service"