Merge "Fix BottomSheetBehavior settling state"