Bug 837027 - Fix social UI for a multi-provider world.  r=gavin