Merge "Add usage of BottomSheetBehavior" into mnc-ub-dev