Moved NotificationMessageService back to internal on ServiceContext