Merge "Add support to SLPI tap gestures"