Revert "Bug 983777 - [B2G][Contacts] Tapping the Favorite button on an imported facebook contact will break the Edit Contact button"

This reverts commit a9b63fa5001dfe7e1fa8bdffe2e4bdc5d5221027.
Bug 986117 - Resolve intermittents in test_settings_app_permissions.py with enhanced wait for Settings app initialisation r=mhenrtty
Merge pull request #17398 from zacc/bug_986117

Bug 986117 - Debug intermittents in test_settings_app_permissions.py, r=mhenretty
Bug 983663 - [Contacts] JSHint fixes for contact unit tests r=arcturus
Merge pull request #17203 from KevinGrandon/bug_983663_contacts_unit_test_lint

Bug 983663 - [Contacts] JSHint fixes for contact unit tests
Revert "Bug 983663 - [Contacts] JSHint fixes for contact unit tests r=arcturus" for Gaia Unit Test Bustage

This reverts commit 4de450bb6f1a6407aa9a23bf211a7e8e9742b913.