Merge "SurfaceTexture: improve texture matrix computation" into jb-dev