Merge "Better API for creating a DICE config descriptor" into main