Merge "Fix BottomSheetBehaviorTest" into mnc-ub-dev