Merge "Fix Settings crashed when WIFI_ADD_NETWORKS" into udc-dev