Merge "Fix bug in createAndManageUser on non hsum devices" into main