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