Merge "Reverted some UserManagerService.Shell refactorings..." into tm-dev