Merge "Remove unused code from WindowSurfaceController" into main