Merge "Fix surface release race when using Shell Transitions" into sc-dev am: 3e7b61b094

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

Change-Id: Ic2107df4fbe01ac07631c93b6e2fd3c7cf9909e0