Merge "Remove DeviceConfig" into main