Merge "Use device type to show corresponding icon and name" into rvc-dev am: ea93f91f am: 444e39bc am: d1105d2a Change-Id: I33d02e553e3980f01a3d979d5a519c8b1ee27e28