Merge "Fix single-user headless DO provisioning" into main