Merge "Fix settling behavior of BottomSheetBehavior" into mnc-ub-dev
am: 84f34d245f

* commit '84f34d245f8664c4b58d763672c77bbc6b2310bd':
  Fix settling behavior of BottomSheetBehavior