Merge "Adds ENABLE_SEARCH_HAPTIC_COMMIT feature flag." into main