Merge "codec2: Fix ambiguity in operator overloads" into main