Merge "Use the correct SettingsEnum for the USI device details page." into udc-dev