Merge "Fix failing UserManagerServiceMockedTest related to admin flag" into main