Merge "allKeys in DeviceConfigHelper should be populated with keys." into main