Merge "[BUG] fix NullPointerException in Notification.java"