Merge "Improve ResamplerBufferProvider"