Merge "Remove prepareSurface from surface placement" into main