Bug 950185 - [B2G] [Settings] Network type does not show user friendly options such as 2G and 3G
Bug 959986 - [DSDS] When one SIM is active, still user can access Call Settings of another SIM card.
Bug 928620 - [Buri][Data usage]Set the phone and internet data report is abnormal
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...
Bug 957932 - Add coverage checkbox for test-agent web interface
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...
Merge pull request #15411 from gitmai/bug-928620-CC-set-reset-report-works-abnormal

Bug 928620 - [Buri][Data usage]Set the phone and internet data report is...
r=salva
Merge pull request #15652 from acperez/bug-963061

Bug 963061 - Clear single variant applications stored in persist partition when flashing gaia
Merge pull request #14205 from bebef1987/prefs

Bug 942909 - Add in the gaia test cleanUp() a option to setup prefs
Merge pull request #15676 from davehunt/bug963476

Bug 963476 - Use a more internationally friendly collection for everything.me collection test
Bug 963503 - [NFC] Shrink UI Type Error in AppFrame in Shrinking_ui.js
Bug 948208 - Add black background on body before loadend
Merge pull request #15130 from RickyChien/issue-957932

Bug 957932 - Add coverage execute button for test-agent web interface r=@yurenju
Bug 950881 In the Facebook datastore simplify indexing by removing the mapping uids --> dsids
Bug 963014 - Remove hacks used to avoid update-checker. r=ahutusoru r=dhunt