Merge "Update device entry icon label and a11y action" into main