[Bug 838005] - SMS - Resolved Merge conflict with v1 traini, removed unneeded include file for this feature which is not in v1-train yet. - URL invocation from message r=borjasalguero
Merge pull request #8513 from crdlc/846218

Bug 846218 - [Homescreen] Dragging performance enhancement(cherry picked from commit ee236c942f2b9abe9065c2fb967b715770a43d9c)

Conflicts:
	apps/homescreen/js/page.js
Merge remote-tracking branch 'ssaroha/sms-v1-train' into v1-train

Bug 838005] [SMS][User Story] Browser invocation from message
Merge pull request #8082 from benfrancis/browser-processes

Bug 836647 Use less foreground processes during screenshotting and Web Activities(cherry picked from commit bae26c4a96b371b794b4433784410c1ec69c5093)
Bug 849280 - lazyloading of HTML, CSS & JS in the browser app r=benfrancis

shared files fix

lint fix

newline

linting errors

lint

lazy loader tests

lazy load shared css

first time thumbnail screen fix

leftovers

topsites screen fixed

web activities fix
(cherry picked from commit d7f7c66a3f296e32a095393cd767022819fc102f)
Merge pull request #8367 from davidflanagan/bug845539

Bug 845539: display correct error message for invalid phone numbers r=gtorodelvalle a=tef+(cherry picked from commit 50e404a41581ac2958b2a377a6e12ec5441b7580)
Merge pull request #8610 from rexboy7/fix-bug832182-2call-unit

Bug 832182: [Communication] Allow second phone call.(cherry picked from commit 1f392276f3976f8a10fa0d1df5b20837008b0144)
Merge pull request #8496 from gtorodelvalle/dialer-bug-838119-call-log-select-all-malfunction

Bug 838119 - [DIALER][CALL LOG] Select all option is not working fine if the device is locked while the user is in the edit mode (r=borjasalguero).(cherry picked from commit 038974f2724feebb99d0bff21885c097a0f2bd42)
Merge pull request #8571 from jmcanterafonseca/fte_importation

Bug 848821 - Refine FTU Hotmail & Gmail import for checking network conn...(cherry picked from commit 38eb11c1d34976bc645be4ea91e52c14139d1d33)
Merge pull request #8633 from davidflanagan/bug848916

Bug 848916 - don't open images that are too big r=dkuo(cherry picked from commit 42a42678460ca9c04add2485823222113003dd6c)
Merge pull request #8606 from gasolin/issue-835350

Issue 835350 Customize Browser Bookmark via iccsettings, r=bfrancis(cherry picked from commit 72bba6330849f93e55fcddc8be73edda72fb3c9b)
Merge pull request #8540 from jmcanterafonseca/live_detect_present

Bug 849116 - For hotmail contacts detect those already imported avoiding...(cherry picked from commit 8cbfae4720852a888a96534255b41ad658dff44a)
Merge pull request #8727 from crdlc/bug-852598

Bug 852598 - [B2G][FTE] During FTE cannot import Facebook contacts(cherry picked from commit c27d6bab0ab2f1a97b046681e0e82cc5bb76126c)
Merge pull request #8698 from crh0716/849751

Bug 849751 - Add cck/spck support to FTU and the system app. r=timdream, fcampo(cherry picked from commit eac11c5bb41b6fbf0348470ba720a6cd7b1783cb)
Merge pull request #8730 from albertopq/bug-852765

Bug 852765 - Duplicated Facebook icon for each contact after ordering by last name r=arcturus(cherry picked from commit f265845ce3a8921fd8f57bf2fff05fd51071b739)
Merge pull request #8581 from arcturus/bug-849814

Bug 849814 - [Contacts] Gmail connector should provide a way to show contacts already imported(cherry picked from commit f2d9dbf61085633b5ef45349cb6d807ca159c6a9)
Merge pull request #8198 from daleharvey/default-background-tabs

Bug 836647 - Set newly created tabs to background by default(cherry picked from commit b4beb05b81ad2fd3d6851a0e87757e7d18e7e72c)
Bug 851281 - No apps are showing in the v1.0.1 version build r=fabrice

Makes |make dogfood| identical to |DOGFOOD=1 make production| and |make
production| the same than |PRODUCTION=1 make reset-gaia|. The goals are now only
shortcuts to using reset-gaia with these env variables.
(cherry picked from commit 82a25aa673c684f0178ab5865f97ad565e4643af)
Merge pull request #8748 from albertopq/contacts-add-email-actvity

Bug 853379 - Update contact activity should allow adding email to existing contact r=arcturus(cherry picked from commit 05e2f93757eaaf553894ebd1157de5d2cb10d4fe)
Merge pull request #8543 from crdlc/bug-848817

Bug 848817 - Connectors should not sort friend lists as friends renderer...(cherry picked from commit 0d62eaaccf12ca98c828cb256d720f618f5d972d)