bug 852569: fix removal of social provider when social is disabled. r=markh, a=bajaj