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

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

Change-Id: I0da464cd387fba9b228cc603f9a149df1c68b8a9