Revert to ffdecd262201292fa007b04df3d20797d967f081
Revert to 8fd72fa4bf07d1c33bf3e22661889ed74e9d7005
Separate update signals for status and avatars