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