fix for flickering avatars
Merge pull request #3377 from AndrewMeadows/inertia

fix for flickering avatars