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