Merge "Fix startup jank in the Wifi Picker." into oc-dev