Merge "Change Wifi Picker icons to colorControlNormal." into oc-dev