Merge "Flag OEM Haptic Vibration Customization" into main