Merge pull request #17371 from evanxd/bug-984574

Bug 984574 - [Calendar] JSHint fixes for js/templates
Merge pull request #17442 from bebef1987/fix_settings

Bug 986329 - Fix test_settings_XXX.py with JavascriptException: TypeErro...
Merge pull request #17454 from 6a68/bug-949051-fxa-settings-app-resubmitted

Bug 949051 fxa settings app resubmitted
Revert "intermittent cost_control tests"

This reverts commit 570751acd66f0179eccc25f189834932bd95abd6.
Revert "address intermittent failure in test_cost_control_ftu"

This reverts commit 06899be78b71f8171c6dde75054e54849b96883b.
Bug 980814 - Disable test_system_message.py r=me a=testonly
Bug 978814 - [DSDS][Dialer] Re-use currently in-use SIM cards for calls. r=rik
Merge pull request #17332 from DouglasSherk/978814-active-call

Bug 978814 - [DSDS][Dialer] Re-use currently in-use SIM cards for calls. r=rik
Bug 986716 - Personatestuser.org is timing out
Bug 980982 - [DSDS] Cache ril.xxx.defaultServiceId in MSAB to avoid IO thrashing. r=rik
Merge pull request #17384 from DouglasSherk/980982-msab-caching

Bug 980982 - [DSDS] Cache ril.xxx.defaultServiceId in MSAB to avoid IO thrashing. r=rik
Revert "Bug 986716 - Personatestuser.org is timing out"

This reverts commit a970a22cceab5537dae680b9a172468602d901c7.
Bug 985888 - [DSDS] Display currently in-use SIM cards on call buttons. r=rik
Merge pull request #17440 from DouglasSherk/985888-active-call-ui

Bug 985888 - [DSDS] Display currently in-use SIM cards on call buttons. r=rik
Merge pull request #17388 from lissyx/bug985117

Bug 985117 - Use the correct SIM number to query voicemail number r=alive
Revert "Bug 982260 - Gaia-integration tests on TBPL fail with: TEST-UNEXPECTED-FAIL | Contacts > Details Merging 15 contacts"

This reverts commit 3ba3079118b95b84d12e0e0a8555d329da4fe4b9.
Merge pull request #17470 from 6a68/bug-986716-reenable-tests

Revert "Bug 986716 - Personatestuser.org is timing out"
Bug 983171 - [Settings] Disable intermittent failing tests
Merge pull request #16541 from 6a68/bug-974108-iac-race-condition

Bug 974108 - Race condition in FxAccountsIACHelper
Merge pull request #17364 from gasolin/bubble974828

Bug 974828 - [Settings][dsds] Outgoing data confirmation is wrong, r=arthur