Merge "CCodec: fix image data update handling"