Merge "Fix setSurfaceTexture to handle surface caching" into m-wireless-dev