Merge "Surface: add unit test for GetAndFlushRemovedBuffers" into oc-dev