Merge "BufferProvider: Clear out mBuffer when changing upstream BufferProvider"