Merge "Refactoring gesture recognition logic" into main