Merge changes I5a218ca1,I853a76d9

* changes:
  Refactoring: Rename SurfaceTextureClient to Surface
  clean-up following Surface split