Merge "Make DeviceConfig getter name explicit." into main