Merge "Fix NPE in NotificationRow"