Merge "Use enabled scrolling child in BottomSheetBehavior"