Merge "Split logging related functinonality out into NotificationLogger."