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

Change-Id: I2e11a47837e268d0955c409e7fb9e2263825fa1b