Merge "Stop Active Gesture Error Detection for Non Gestural Navigation Mode" into main