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: Iedd65d9464c7dce15d73f5b5530217b1518d7836