Merge "NotificationCleanupConfig.java - Fixed sonar issue"