Merge pull request #8973 from cvan/packaged-marketplace

Bug 856799 - Make Marketplace a packaged app(cherry picked from commit 9b1fa182e4ac13643326394efeda26e7d4e98145)

Conflicts:
	external-apps/marketplace.firefox.com/update.webapp
Merge pull request #9008 from fcampo/SmsDeletedContact

Bug 847332 - Sms still shows contact name after deleting the contact(cherry picked from commit 89b0fb3518852265b7a0b6cd937960ed35fc0044)

Conflicts:
	apps/sms/js/thread_list_ui.js
Merge pull request #8674 from samjoch/bug-848526-AddAFaviconUnderlayInBrowser

Bug 848526 - Add a favicon underlay in browser r=benfrancis(cherry picked from commit 07706f330c0f556f21e63841dbbaa6713cbc9666)

Conflicts:
	apps/browser/style/browser.css
Bug 827804 - [Lockscreen UX] Entering passcode. "Emergency call" and "Cancel" buttons should be vertically centered
(cherry picked from commit 2d654221796a99d2b6e02d56605a553fe053f965)
Bug 815653 - [Settings] - remove :active for explanation items

Conflicts:
	apps/settings/style/lists.css
(cherry picked from commit 2719296e7500aa39d0cb7ae6d8ec3ba7df6a3fe5)
Merge pull request #9088 from albertopq/contacts-first-chunk-imp

Bug 846895 - Improving contacts first chunk rendering time r=arcturus(cherry picked from commit a4d3b4317a751db49b27d92ce0c51579e9fbee4f)
Bug 853716 - handle sms: uris with a body and no number r=borjasalguero
(cherry picked from commit 3c63c1dd7b7e0452df5b793d85052c4e60eaacde)
Merge pull request #9075 from crh0716/857855

Bug 857855 - Force create database for async storage. r=albertopq, a=leo+(cherry picked from commit 56c53e090412cf8aeb7b80a812b90229ec4d6cd6)
Merge pull request #9087 from RudyLu/keyboard/Bug834182-suggestion_bar_showhide

Bug 834182 - Add a delay before hiding the keyboard suggestion bar. r=timdream, a=tef+(cherry picked from commit 789c00c1b00795168fb909c814d3d34e3a7b4eea)
Merge pull request #9081 from evelynhung/issue-855642

bug 855642 - display proper network state, r=arthur(cherry picked from commit 24deff896b0e4965a485ee8759ee0ca00a6ad69b)
Merge pull request #8999 from nsarkar/perso

Bug 857259 - Display the pin entry UI for cck/spck, r=kaze(cherry picked from commit 159443fa50e59c0928b967d4436490c7a0a31295)
Merge pull request #9035 from crh0716/855524

Bug 855524 - Localize lazy loaded contents(cherry picked from commit 2d48fb6a0d209e39907419762d51b4f4eece7113)
Merge pull request #8729 from gtorodelvalle/dialer-bug-852515-withheld-number-text

Bug 852515 - [Dialer] Inclusion of 'withheld number' instead of 'unknown number' (follow-up of 850170) (r=fcampo)(cherry picked from commit 18b336a8e6521e656f44b05f50de30c0e3f2b5e8)
Merge pull request #8754 from dominickuo/email-support-save-video

Bug 852477 - [email] Use MimeMapper to determine the downloadable attachments, r=asutherland(cherry picked from commit 2b7b5351272bbd22807836196c1d6a7675c5a288)
Merge pull request #9110 from evelynhung/issue-860205

bug 860205 - check visible state when initialing. r=arthur(cherry picked from commit 79ccd192e70f99feb9a10e6e83dd8de0a4971160)

Conflicts:

	apps/settings/index.html
Merge pull request #9131 from evelynhung/uplift-860205-v1-train

Merge pull request #9110 from evelynhung/issue-860205
Merge remote-tracking branch 'upstream/v1-train' into v1-train