Merge "UsbDeviceSettingsManager: don't write settings file when not necessary"