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