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

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

Change-Id: I2b0ac053dc6de7b30c47f9f99b657c2076212c71