Merge "Make DeviceState rely entirely on Nene." into sc-dev