Merge "CCodecBufferChannel: add null checks"