Merge "Explicitly set a user for the wpa_supplicant service" into main