Merge "Fix possible invalid pointer index in swipe dismiss." into klp-modular-dev