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

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

Change-Id: Iceee72cec78b848807b75c0e2f81c38da99730dc