Merge "Fix BottomSheetDialog after swiping it down" into nyc-support-25.2-dev