Merge "Follow RegionSamplingHelper being moved into shell" into main