Merge "Reorder user icon colors so that the first default is teal" into lmp-dev