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

* commit '623887b54da09facfdd3624233a9a9c41aa90cd5':
  Fix BottomSheetDialog when it is short