Merge "Track command line change / switch to DeviceConfig" into sc-dev