Merge "Fix NPE in NotificationLogger for real this time"