Merge "Apply depth even when surface is null" into sc-dev