Moving MY_AVATAR_KEY back into AvatarManager.cpp