Reduce locators, settings app
Bug 962504 - Investigate intermittent fail on test_cost_control_reset_wifi
Bug 922391 - [B2g] [E.me] UI overlaps when user tries to delete an app from the dock area
Bug 961569 - Fix modal dialog under mozfullscreen
Bug 959986 - [DSDS] When one SIM is active, still user can access Call Settings of another SIM card.
Merge pull request #15677 from crdlc/bug-922391

Bug 922391 - [B2g] [E.me] UI overlaps when user tries to delete an app f...
Merge pull request #15673 from alivedise/bugzilla/961569/fullscreen-modal-dialog

Bug 961569 - Fix modal dialog under mozfullscreen, r=timdream
Merge pull request #15549 from jaoo/959986

Bug 959986 - [DSDS] When one SIM is active, still user can access Call Settings of another SIM card. r=arthurcc
Merge pull request #15597 from AndreiH/bug962504

Bug 962504 - Investigate intermittent fail on test_cost_control_reset_wi...
Merge pull request #14503 from viorelaioia/bug_942107_settings

Bug 942107 - Reduce locators, settings app
Revert "Revert "Bug 946205 - Re-enable Travis tests after 891882 merged" for mochitest 5 timeouts"

This reverts commit 213d4eff522a9cc557d659d7a2e7038a9935fe4a.
Merge pull request #15406 from cctuan/950185

Bug 950185 - [B2G] [Settings] Network type does not show user friendly o...
Bug 957100 - [Settings] add marionette for b2g-improve and feedback page