Merge "Fix bottom sheet race condition and well handle drag stitutation" into ub-launcher3-master am: c4a30b85ff am: aef3094690

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

Change-Id: Ia29d8ee457a1437c72660719c8315af6d3f2a4c7