Merge "[Wi-Fi] Fix exception when 'Add device' with a Wi-Fi suggestion network" into rvc-dev