Better support for avatar previews [#60196110]