Bug 844990 - Remove race condition cause by bug 842627 on setting
displayedApp in Window Manager
Merge pull request #8177 from borjasalguero/restore_desktop_testing

Bug 842315 - [SMS][Desktop] Restore desktop testing r=fcampo(cherry picked from commit 993ba10c3daf8cd507b67839b1b7349f9572d1d9)
Merge pull request #8329 from borjasalguero/split_js_files_rebased

Bug 843163 - [SMS] Split 'sms.js' in some files for getting a better arc...(cherry picked from commit 74cee2b2ca39fe9ba96c17f36664b4b8296cbaa8)
Merge pull request #8337 from borjasalguero/optimize_loading_time

Bug 844770 - [SMS] Optimize starting time with lazy-load r=julienw(cherry picked from commit 905cc8802794db12eddb0f94dca9dc5d0d3f4e67)
bug 846220 - back out 7359be50cc60e737d44ea0d0c0dff29fc2a1a95d
Merge pull request #8503 from daleharvey/834620-camera-lazy

Bug 834620 - Lazy load camera resources until preview starts. r=vingetun(cherry picked from commit 1f7dbc2534914620ba05126e99eb47991de758e6)
Bug 832082 - Stk proactive command to display text does not function properly after receiving set idle mode text, r=vingtetun
(cherry picked from commit cd217e574b202b2e8eb5e48498705e6cd750e457)
bug 844770 - reverting 7c49a7c651e3569c10969b6cdba053579a90916a because it depends on bug 841251 which is not on v1-train yet
bug 834620 - back out 0542a2f3c2f33274a90082011a13ef5d8a8c315f because bug 841251 hasn't landed yet
Merge pull request #8587 from kanru/bug850112

Bug 850112 - Enable A-GPS prefs r=fabrice
Bug 847830 - Changed CUSTOMIZE environment variable to GAIA_DISTRIBUTION_DIR
Merge pull request #8608 from yurenju/bug-847830-v1-train

Bug 847830 - Changed CUSTOMIZE environment variable to GAIA_DISTRIBUTION_DIR, r=timdream a=tef+
Merge pull request #7951 from KevinGrandon/bug_835507_lazy_email

Bug 835507 - lazy load email resources(cherry picked from commit 886b27d9d77f7c3a6fd05631e45cd63e8bbe69e9)
Bug 842575 - correctly kill the application when pushing a new version r=julienw a=npotb

Correctly find the pid
(cherry picked from commit bff669dbccd14042930ac6ac99063e3d36ec0dfd)
Merge pull request #8615 from stasm/849226-polish-keyboard-layout

Bug 849226 - Polish should have its own keyboard layout. r=rudyl, a=shira+(cherry picked from commit bc81fa5f3fffc9f6c8b216d19bf717fa77f2d628)
Merge pull request #8066 from asutherland/email-land-imap-use-tcp-shim

Bug 814257 - [email] Move back-end into worker thread (speculative). groundwork, use node shims instead of mozTCPSocket. r=asuth, a=gal(cherry picked from commit 0f87a505a1b1972dff92de35a04ec618492f31c9)
Merge pull request #8070 from asutherland/email-explode-backend

Bug 814273 - [email] Replace concatenated gaia-email-opt.js with the files that make it up (as a vendor code drop). r=asuth(cherry picked from commit 02056c64bc15f879d5bdb1b4d02aa4b89bc4a5e7)
Merge pull request #8088 from KevinGrandon/shared_lazy_loader

Bug 841251 - Implement a simple shared lazy loader.

Official r=viven, thanks to mozsquib, rwldrn, asuth, daleharvey for feedback.(cherry picked from commit ab1d2c275643769a1854c49bfe5a3db2aa972542)

Conflicts:
	apps/gallery/js/gallery.js
Bug 849226 - Follow up to: Polish should have its own keyboard layout

Use Python 2.6-compatible syntax for string formatting so un-break the tbpl
builds.
(cherry picked from commit e72327872c67ead87a051992a2706856be065673)
Bug 849876 - [B2G][FM radio] Blank white screen is shown when launching FM radio r=pzhang

Revert an unfortunate change from bug 841353
(cherry picked from commit 51c751d845a7640c5421db357a5fcc543cb8be30)