Merge "Use wifi icon for wifi devices in companion chooser" into oc-dev