Merge "Add flag to enable Haptics Customization feature" into main