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: I1c1d59d345c7b622c1a0c4c8bac3517c558a3ef7