Merge "Fix CodecLooper queue block issue" into main