Merge "Fixed createAndManageUser() for headless system user mode." into sc-dev