Merge "Remove reliance on surface to update depth" into sc-dev