Bug 1074845 - Tackle test_add_contact_to_favorite.py intermittent with a stronger wait
Bug 1095469 - [Collection] Use mozSettings for cdn url r=daleharvey r=rickychien
Bug 1095469 - merge pull request #25960 from KevinGrandon:bug_1095469_collection_cdn_url to mozilla-b2g:master
Bug 1083126 - Update test_sms_with_attachments.py to match the manual smoketest
Bug 1094185 - [DSDS] Make testvars.json handle 2 SIMs
Merge pull request #25925 from zacc/bug_1074845

Bug 1074845 - Tackle test_add_contact_to_favorite.py intermittent with a...
Merge pull request #25564 from chirarobert/mms_update

Bug 1083126 - Update test_sms_with_attachments.py to match the manual sm...
Merge pull request #25999 from JohanLorenzo/bug-1094185

Bug 1094185 - [DSDS] Make testvars.json handle 2 SIMs
Revert "Bug 1094185 - [DSDS] Make testvars.json handle 2 SIMs"

This reverts commit 720389fd133ba152d907c4ff7796355f7719b821.
Bug 1094185 - [DSDS] Make testvars.json handle 2 SIMs
Merge pull request #26007 from JohanLorenzo/bug-1094185-master-second-try

Bug 1094185 - [DSDS] Make testvars.json handle 2 SIMs
Bug 1086529 - [Template] Consider lazy initializing the Template library r=djf