Merge "Adding disconnect call to the SurfaceTextureTarget" into jb-dev