Merge "Revert "CCodec: fix dataspace configured for the input surfaces"" into sc-dev