Merge "Apply colors when a non managed user is added" into sc-dev