Merge "[NAN] Re-factor connect/config flow" into mm-wireless-dev