Merge "Update device entry icon color" into main