Merge "Codec 2.0: fix multi-fd sync fence support" into main