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

* commit '7cf2a134424e8d7a5095f0df1749bfe871dabb8a':
  Fix BottomSheetDialog when it is short