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