Merge "Fix UsbDeviceSettingsManager locking."