Merge "Update AssociationInfo with deviceIcon field" into main