Merge "Further isolate the Surface from WindowState."