Merge "Fix BottomSheetDialog when it is short" into mnc-ub-dev