Merge "Don't register DndConditionCardController anymore" into main