Resolves user avatar flickers as you type

Closes #27602

See merge request !8950