Merge "Show single icon layout for unknown device type in advanced header." into udc-dev