Merge "Delete unused code in WindowSurfaceController"