am 2a21a77d: Merge change I1369e9ab into eclair

Merge commit '2a21a77d5cf481b129a7cb4e3e00424e4d300e6d' into eclair-mr2

* commit '2a21a77d5cf481b129a7cb4e3e00424e4d300e6d':
  Work on issue #2144454: Inconsistent swipes...