Merge "Modify comments for SurfaceSession." into main