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