Merge "Make distance count when dismissing swipedismisslayout" into klp-modular-dev