Merge "CCodecBufferChannel: Resolve race condition around mComponent" into main