Merge "Merge WindowSurfaceController to WindowStateAnimator" into main