Merge "Remove obsolete NativeWindow_fromSurfaceTexture"