Bug 855021 - [Browser] tab tray doesn't open upon first launch - for v1-train and v1.0.1 only
Merge pull request #8941 from borjasalguero/bug_thread_id_rebased

Bug 851032 - [SMS] Receiving a new message it's not properly threaded r=...(cherry picked from commit 86a79ba3fdfb0eb6f593e34887fa89e3553d1a66)

Conflicts:
	apps/sms/js/sms_mock.js
Merge pull request #8979 from benfrancis/bug855021

Bug 855021 - [Browser] tab tray doesn't open upon first launch
Merge pull request #8792 from crdlc/bug-851684

Bug 851684 - [B2G][Contacts][Settings]: Cannot update the contacts label...(cherry picked from commit aad79d95bee682d0c5eeb53775237f3bdcc6a768)
Bug 832261 - Calendar scrolling issue. Author=leob2g
Merge pull request #7957 from CervantesYu/bug-834642

Bug 834642 - Lock screen orientation to portrait-primary in cards view. r=timdream(cherry picked from commit 1ece84370cd6d9c70af7e9214a4ec9280134800c)
Merge pull request #8837 from jrburke/bug826118_imaploss

Bug 826118 email: track deathback and clear it for proper recovery after conn loss r=squib(cherry picked from commit 6cd62e013c3ae5913310e3c1b76cd44e8bb09884)
Merge pull request #8957 from crdlc/bug-857178

Bug 857178 - [Homescreen] add storage permission r=djf(cherry picked from commit 7ad4ddd0c340c77eecaee4ee6c5a5a65357f4045)
Merge pull request #8942 from jmcanterafonseca/fix_l10n_types

Bug 854618 - A Facebook contact's Home field title is shown in English(cherry picked from commit 85fff9a2566b3878b7b61cca523bf2da7b31e0ce)
Merge pull request #8777 from asutherland/email-fix-imap-append

Bug 854097 - [email/IMAP] Saving sent mail to 'sent' folder on servers that don't support MULTIAPPEND regressed by bug 814257. r=asuth(cherry picked from commit 957409a2125b798514ffee62e05c81e405ae4094)
Merge pull request #8986 from crdlc/bug-857925

Bug 857925 - Contacts images from FB are not displayed on search view(cherry picked from commit 9752a9bbbd46278f3703ad529b12d4eaeb3ef286)
Revert "Merge pull request #8941 from borjasalguero/bug_thread_id_rebased"

This reverts commit f6a48343e3b5aaed19688ab50b90f1605a519365 because Bug 850127
got backed out from the b2g18_1_0_1 branch.
Merge pull request #8244 from davidflanagan/bug826211

Bug 826211 - correct container size for gallery pick/crop activity r=djf(cherry picked from commit 99ebe8ba7417e73ca0acf9f110ef0d781a80989e)
Merge pull request #9028 from davidflanagan/bug854168-v1.0.1

Merge pull request #8244 from davidflanagan/bug826211
Bug 852075 - Reliable home button in inline activities
Merge pull request #9034 from alivedise/bugzilla/852075_v1.0.1_merging/reliable-homebutton-on-inline-activity

Bug 852075 - Reliable home button in inline activities, r=timdream, a=blocking-b2g:tef+
Merge pull request #8864 from frsela/STK/Bug854792

Bug 854792 - [Buri][Settings]it will always go into SATK menu when open settings, r=kaze(cherry picked from commit 35c12720bfe8b9aa35bb5abfb39cc6c8bb146226)
(cherry picked from commit a29c1b3aed248e42c911bc2d60c64488c2678edf)
Merge pull request #8965 from frsela/FixLint

Bug 854792 - [Buri][Settings]it will always go into SATK menu when open settings, r=kaze(cherry picked from commit fcfe81c9181e39e8632afa20b1a7fda0f643b308)
(cherry picked from commit dee9fe8a7b46388eb111e7f50b6eef4dc60fc097)
Merge pull request #8941 from borjasalguero/bug_thread_id_rebased

Bug 851032 - [SMS] Receiving a new message it's not properly threaded r=...(cherry picked from commit 86a79ba3fdfb0eb6f593e34887fa89e3553d1a66)

Conflicts:
	apps/sms/js/sms_mock.js
Merge pull request #8301 from crdlc/bug-827130

Bug 827130 - Feels like cannot pan page if gesture starts as blocked ove...(cherry picked from commit c62a8f8ec27981334c817485cb65362957ec5df2)
(cherry picked from commit 8848a0c8c1e19ac3cb414d9745b5f751886a433d)