Merge branch 'split_rendering_contributions_21_and_35' of forge.3gpp.org:ivas-codec-pc/ivas-codec into split_rendering_contributions_21_and_35
