Merge "Show advanced device icon in Connected devices list by new metadata" into sc-dev