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

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

Change-Id: Iaaf417215e3c9352f959d54184b4e221dcf8caed