Merge "Codec2BufferUtils: add support for more color aspects" into sc-dev