Merge changes I9b8e1962,I7bb843ca

* changes:
  Temporarily don't return the current buffer in synchronous mode
  unify SurfaceTexture and Surface