Merge "Tap gesture settings"