Merge "Fix incorrect UI issue of "previously connected devices""