Merge changes I083c4133,If904634e

* changes:
  make sure to re-initialize SurfaceTexture to its default state on disconnect
  Fix screenshots