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

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

Change-Id: Ia49a91dd5e62cf0058b16ba92c9c452f8fbc2c74