Merge "Fix BottomSheetBehavior for non-last child" into mnc-ub-dev