Merge "Create SurfaceSession before creating DimLayer."