Merge "CCodecBufferChannel: rendering depth to default to 3" into udc-dev