Merge "Fix NPE onNotificationRemoved"