Merge "Fix UserManagerTest when running on non-main user" into main