Merge "BottomSheetDialog is canceled when swiped down" into nyc-mr1-dev