Merge "Sonar fix: Notification.java"