Merge "Rename constants for MixBufferSize to SinkBufferSize"