Merge "Fix Handling of user switching for headless user 0 model."