Merge "get rid of Surface::getISurfaceTexture()"