Merge "Fixing deadlock when surface creation is waiting on surface destroy"...

Merge "Fixing deadlock when surface creation is waiting on surface destroy" into sc-dev am: 9ccd3c5e

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

Change-Id: Ifbfcb12c653035489552644e3afe4f524ee69c23