Merge pull request #8421 from jmcanterafonseca/fix_sync_phoyo

Bug 846708 - When a contact adds a picture on his facebook profile it is...(cherry picked from commit 2ac5e248fe5bf69c6261d8c475e976105ca1b99b)
Merge pull request #8447 from albertopq/issue-846851

Bug 846851 - Contacts photo and star icon dissapear from the Favorites section r=arcturus(cherry picked from commit 64ea3b586ec0b59687a682c03e902695ba07ee7b)