Merge change I1369e9ab into eclair

* changes:
  Work on issue #2144454: Inconsistent swipes...