Merge pull request #8727 from crdlc/bug-852598

Bug 852598 - [B2G][FTE] During FTE cannot import Facebook contacts(cherry picked from commit c27d6bab0ab2f1a97b046681e0e82cc5bb76126c)
Merge pull request #8730 from albertopq/bug-852765

Bug 852765 - Duplicated Facebook icon for each contact after ordering by last name r=arcturus(cherry picked from commit f265845ce3a8921fd8f57bf2fff05fd51071b739)