Merge "single buffer mode for SurfaceTexture"