Merge "Some cleanup for SwipeDetector." into ub-launcher3-qt-future-dev
am: d39f7b51c8

Change-Id: Ifadf65abe4239a703c3d15eddc6ebd51a405a5e9