Merge "Gesture Error Detection - Improvements Part 2" into main