Bug 827794 - Update clear icon.
Bug 817927 - [Contacts] Even if Facebook is disabled, you can still click facebook switch
Merge pull request #7426 from basiclines/contacts_switches_improves

Bug 817927 - [Contacts] Even if Facebook is disabled, you can still clic...
Merge pull request #7422 from KevinGrandon/bug_827794_clear_icon

Bug 827794 - Update clear icon. r=pivanov
Auto-merge from branch 'master'