Merge "Headless: Switch to supplied user or previous user after boot."