Merge "Start the mainline supplicant as user 'wifi' rather than user 'root'." into main