Merge "NotificationCleanupConfig class fix"