am 68a68949: am 101e3793: am 07763e30: Merge "Make distance count when dismissing swipedismisslayout" into klp-modular-dev

* commit '68a6894950c210e9ad9300a16acb5870b13c124f':
  Make distance count when dismissing swipedismisslayout