Delete BufferQueue fixes and use SurfaceTextures from patch 1