Merge "Use device type to show corresponding icon and name" into rvc-dev