Merge "Codec2: Make surface change work"