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