Merge "Mark NotificationEntry.Data.key as final"