Merge "CCodec: Move qpOffsetMap from param list to info buffers" into main