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

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

Change-Id: If58faa8b065591adac41d94012fa3988b81470e4