Merge "Ensure Surface matrix set even when size unchanged."