Merge "Adds a debug & server configurable delay to search haptic hint" into main