Merge branch 'main' into 917-split-rendering-lcld-codec-unused-symbols