Merge "Remove explicit creation of SurfaceSession in WMS" into main