Merge "swipe-dismiss: use original context for theme check" into main