Merge "Check device icon for legacy associate method" into main