Merge change 8410

* changes:
  Have the notification service only have notifications diabled until setup wizard has been run.