Merge "Add data layer for the DeviceEntryIcon" into main