Merge "Wifi details: minor ordering fixes." into oc-dev