Merge "Fixing deadlock when surface creation is waiting on surface destroy" into sc-dev am: 9ccd3c5e12 am: d46e3b0322 am: 4404d91d95

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

Change-Id: I2c9ea5c5c0ebed5dae56f1b9d90b08bf17f1c617