Merge "[BugFix] Always include default device id when getting all device ids" into main