Activity avatars leak from one flavor to another

[goldpbear]

Sometimes, after switching map flavors, activity avatars from the previous flavor will remain in use on the current flavor, even if the default avatar is set differently in the config. This might be a caching issue, or another bug could exist.