Move avatar decorators and overrides to social_stream