Merge change 24850 into eclair

* changes:
  Last big work on #1991910: Make swipes work with capacitive keys