Bug 1001856 - [settings] remove unused localization strings from Firefox OS 2.0
Bug 1003993 - FxA System app - remove refs to 'accountId', replace with 'email'. r=ferjm
Bug 1004099 - FxA Settings app - remove refs to 'accountId', replace with 'email'. r=arthurcc
Bug 994533 - [Sora][WIFI] The return button display error in wifi page
Bug 864395 - Correctly test send perf data checkbox;
Bug 841422 - Follow-up, move template_test.js into sharedtest r=me
Bug 971443 - [System2] Instantiable Accessibility r=alive
Bug 995116 - [Tarako][MMS][Gallery] SMS/MMS OOM after attach a large pixel picture from gallery r=azasypkin

This patch does the following changes:

* we use -moz-samplesize to decode the images to resize them
* we try to free data more aggressively by using setTimeout

(Original patch from Steve Schung, then modified)
Bug 988268 - [Cost Control] 'When use is above' parameter is set to '0' the red line appearing at the top of the graphic
Bug 1006995 - Fix the failure of test_sms_to_dialer.py
Bug 997601 - Save the caller id preferece across reboots
Bug 968087 -[Cost Control] Refactor and simplify Cost Control start-up process
Merge pull request #18793 from julienw/995116-attachment-reduce-memory

Bug 995116 - [Tarako][MMS][Gallery] SMS/MMS OOM after attach a large pix...
Bug 1000299 - Requesting a high priority wake lock when inserting a missed call in the call log.
Merge pull request #19031 from bebef1987/sms_dial

Bug 1006995 - Fix the failure of test_sms_to_dialer.py
Merge pull request #17704 from gitmai/bug-988268-CC-limit-non-zero-add-invalid-css

Bug 988268 - [Cost Control] 'When use is above' parameter is set to '0' ...
r=jmcf
Merge pull request #18665 from gitmai/bug-968087-simplify-startup

Bug 968087 -[Cost Control] Refactor and simplify Cost Control start-up p...
r=salva
Bug 1003725 - [FTU-separation] Move import.html and related resources to shared/pages/import
Merge pull request #18989 from etiennesegonzac/bug-1000299-tarako-call-ended-missed

Bug 1000299 - Requesting a high priority wake lock when inserting a missed call in the call log r=gsvelto
Bug 999506 - Detect the device_root before pushing/clearing files from the device, remove hardcoded references to /sdcard