Bug 846909 - Inject performance helper atom with marionette
Bug 1001856 - [settings] remove unused localization strings from Firefox OS 2.0
Bug 846909 - Part 2: remove some debug messages. Use Object.defineProperty()
[Bug975558][Camera][Madai]Visual Design Self-Timer
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 1003771 Move distribution_tablet/homescreens.json to apps/homescreen/build/tablet/
Bug 994533 - [Sora][WIFI] The return button display error in wifi page
Bug 864395 - Correctly test send perf data checkbox;
Bug 1003384 - [B2G][1.4][SMS] - The phone type "Other" is not translated in any of the languages when suggested contacts are shown in SMS.
Bug 967440 - Remove some reflows on the keypad. r=Rik
Bug 841422 - Follow-up, move template_test.js into sharedtest r=me
Bug 971443 - [System2] Instantiable Accessibility r=alive
Bug 985333 - [Keyboard UX update][User Story] Default Upper case layout
and typing hints.
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 #18569 from RudyLu/keyboard/Bug985333-key_popup_case

Bug 985333 - [Keyboard UX update][User Story] Default Upper case layout
r=timdream.