Merge "Don't automatically start user 0."