Bug 1096928 - Address intermittent in test_add_contact_to_favorites.py
Bug 1080905 - [System] Rename System to Service r=alive
Merge pull request #25013 from KevinGrandon/bug_1080905_rename_system

Bug 1080905 - [System] Rename System to Service r=alive
Merge pull request #26031 from zacc/bug_1096928_pt2

Bug 1096928 - Address intermittent in test_add_contact_to_favorites.py