[automerger skipped] Merge "Refactor SwipeDetector to track both axes" into ub-launcher3-qt-future-dev
am: f13109df05 -s ours
am skip reason: change_id I54c71088cfe99ff28cdc719a1eb7a7d06ac95d2d with SHA1 5aeb3b84b8 is in history

Change-Id: I890cdcb712333c1519b411be1220e2710e290f8d