Merge "Add device entry icon support for GONE => LS" into main