Merge pull request #10437 from cctuan/883091

Bug 883091 - [Dialer] Autosuggestion is not working properly when a cont...(cherry picked from commit 06ea38cdd5d4fd098ed37bfada64c91135c406ef)
Bug 852321: Update xulrunner SDK to reduce download time. r=ochameau
(cherry picked from commit f7fffb5bf8caa8170f3a0d821ab1f7a195a244c0)
Bug 881248 - [MMS] Multirecipient. A contact with >1 number must only render the relevant number (vs. rendering all) r=julienw

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit 6406b9a535b5fcd7143a6ccb58c03a3a7b4296c5)

Conflicts:
	apps/sms/test/unit/mock_utils.js
Bug 840038 - [MMS][User Story] Image rescaling to 300kB(Apply to composer attachment) - r=gnarf

Adds resizing step in Composer
Adds a resizing notification
Adds Composer.isResizing
Only show file too large error when not an image
Refactors getting mmsSizeLimitation
Defaults to 300k for mmsSizeLimitation
Adds "resize-image" locale string
Adds number: 1 to pick action

Closes gh-9854
(cherry picked from commit dea31788f6da0abcd9e6d83f7dbf26b89c6f8063)

Conflicts:
	apps/sms/manifest.webapp
Merge pull request #10321 from borjasalguero/message_activity_proposal

Bug 880115 - [SMS / MMS] Activity handling does nothing when triggering ...(cherry picked from commit 5026dfab780b3d5205d419b9979baeebcd12bf73)
Bug 814840 - Isolate FTU Launcher from Window Manager

Conflicts:
	apps/system/index.html
	apps/system/js/window_manager.js
	apps/system/style/system/system.css
	apps/system/test/unit/captive_portal_test.js
Merge pull request #10590 from oconnore/879203-homescreen-opacity

Bug 879203 - opacity transition in home screen is not smooth r=crdlc(cherry picked from commit d45b4889fa5ba6dc6400aedf1310521d5d09948b)

Conflicts:
	apps/homescreen/js/grid.js
Revert "Bug 854842 - Check FTU running before visibility change"

This reverts commit ee55b12d8bf8fcfc49f271e7f4a1086f47eeea96.
Because we are uplifting bug 814840 to v1-train.
Revert "Bug 875646 - Bypass FTU sim lock checking"

This reverts commit 5af655da5ba0bc48d4c69a0b668112321f1dd6be.
Because we're uplifting bug 814840 to v1-train.

Conflicts:
	apps/system/js/sim_lock.js
	apps/system/js/window_manager.js
Revert "Bug 831697 - White screen after receive a call in FTE"

This reverts commit 0106127dff01dc98d90ad394cc69fd0d67cd2230.
Because we're uplifting bug 814840 to v1-train.
Uplifting 814840 - resolve conflict of bug 875646, reverting
aa166a4f3c03917d208a347fe96303fcad58f0fa
Merge pull request #10633 from alivedise/bugzilla/814840_v1-train

Bug 814840 - Uplift FTU launcher to v1-train,
Backout bug 854842, bug 875646, bug 831697, bug 877062 on v1-train. r=timdream, a=leo+
Bug 886844 - icc.json should be written in the system app

(cherry picked from commit cd3b6af7b72d70f45ec1bcb9d0d6891c111d6c73)
uplift: Bug 865079 - [Call log] Remove synchronous reflows
(cherry picked from commit d1d250f7e7074841dcec106e41f1ffd1671747f1)
Merge pull request #10640 from fabi1cazenave/uplift-bug865079

Uplift bug865079
Bug 882756 - [SMS][MMS] We don't find the correct contact if an incoming SMS has a local/national number a=tests

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Bug 884050 - [SMS][MMS] Regression. New renderContact rules missed untested cases - r=gnarf

https://bugzilla.mozilla.org/show_bug.cgi?id=884050

- Only render a contact's tel value entry for the _specified_ input value when not rendering a suggestion. If the tel record value _doesn't_ match, then continue.
- If rendering for contact search result suggestions, don't render contact tel records for values that are already selected as recipients. This comparison should be safe, as the value in this.recipients.numbers comes from the same source that current.value comes from.

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit 3191a6fc9a6b295d0b401da23e71bbcc4136f77b)

Closes gh-10448
(cherry picked from commit 2a27da68945c1353d92be68ba8bf709af2c2545a)
Merge pull request #10621 from cctuan/v1-train

Merge pull request #10437 from cctuan/883091
Merge pull request #10627 from gasolin/customfb

Bug 883344 Only use default facebook app id if is mozilla partner build, r=tim
(cherry picked from commit be79ceb2b5d399087745a8af0da6a30d09d4d742)
Merge branch 'v1-train' into v1.1.0hd