Merge "Use device type to show corresponding icon and name" into rvc-dev am: ea93f91f am: 289eb5b8 Change-Id: Ica36f2b2ff1e20d159bd334ac89d2c6da853d28b