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

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

Change-Id: Ie1a4cfb80a1cb41827799004ea99994d89609263