Merge "Fix behavior when config_guestUserAutoCreated=true" into sc-dev