Merge "Codec2: Fix config-start order"