Merge "swipe-dismiss: add DIALOG_CLOSE support" into main