Merge "Remove ContactDetailLayoutController's social code"