Merge "Fix SurfaceView window crop computation" into main