Merge "CCodec: Report error when display surface is obsolete"