Merge "NotificationInfo should use the notification theme"