Noticed that we had two duplicated validators for avatar types. This diff unifies them, and opts for the more specific validator where there were differences (in just one case).

Depends on D8146

Flow