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

Change-Id: Ibb4aaf65c72af970c4e6dd2dab146689943899a9