Merge "Rename BottomSheetListener to BottomSheetCallback" into mnc-ub-dev