MSW fixes for Surface copy semantic changes