Merge "Remove NotificationData"