Merge "BottomSheetBehavior passes View to callbacks" into mnc-ub-dev