Merge "Fix BottomSheetDialog when it is short" into mnc-ub-dev am: 7cf2a13442
am: bec43dcc29

* commit 'bec43dcc29fb7a3494139b470b0481106e1973a9':
  Fix BottomSheetDialog when it is short