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

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

Change-Id: I2cff2cfbce4fff3681e1e244f52a1be072108e08