Merge "Update haptic settings owners" into main