Merge "Revert "Apply depth even when surface is null"" into sc-dev am: 8d43e46261 am: 56cc5f0a39 am: fe7bc4ed54

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15341690

Change-Id: Ifbcf9b179f82739157981f96b35a5cf7381901d7