Merge "Add tests for BottomSheet" into mnc-ub-dev