Merge pull request #17372 from gtorodelvalle/contacts-bug-982260-intermittent-failure

Bug 982260 - Gaia-integration tests on TBPL fail with: TEST-UNEXPECTED-FAIL | Contacts > Details Merging 15 contacts
Converting homescreen swipe animation to be velocity-sensitive
Bug 984238 - Don't kill the keyboard when when it's being launched
Bug 949051 - (Resubmitted) Add Firefox Accounts to Settings app, preffed off. r=arthurcc
Merge pull request #17453 from KevinGrandon/bug_983663_contacts_unit_test_lint_2

Bug 983663 - [Contacts] JSHint fixes for contact unit tests r=arcturus
Merge pull request #17313 from askeing/983070

Bug 983070 - [Message][UI Test] The received message should not causes message thread to open in the thread list view.
Merge pull request #17397 from zacc/bug_986058

Bug 986058 - in gaia_data_layer atom use string contactenation r=davehun...
Merge pull request #17389 from viorelaioia/bug_985903

Bug 985903 - Investigate test_camera_capture_video.TestCamera intermittent fail
Merge pull request #17366 from viorelaioia/cost_control_tests

intermittent cost_control tests
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