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

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

Change-Id: I31f036a1f2619eecf6d91397ead54f8223409ec1