Merge "Fix settling behavior of BottomSheetBehavior" into mnc-ub-dev