Merge "wifi: handle updating a config via network id directly" into sc-dev