Merge "Fix BottomSheetBehaviorTest" into nyc-support-25.4-dev