Merge pull request #10437 from cctuan/883091

Bug 883091 - [Dialer] Autosuggestion is not working properly when a cont...(cherry picked from commit 06ea38cdd5d4fd098ed37bfada64c91135c406ef)
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 pull request #10632 from ferjm/localizemmi

Bug 879032 - Localize MMI code strings. r=etienne
(cherry picked from commit c92d1485d8bdaaad385bd7d87fd1b1278e45f026)
Merge pull request #10626 from frsela/STK/Bug886810

Bug 886810 - [STK] Stop while FTU
(cherry picked from commit 71a6181a8d3413a79b81353acaebb1a24eb8073a)
Merge pull request #10504 from crh0716/883053

Bug 883053 - Restore the original connection when connection fails.(cherry picked from commit 1667bf5baa948cd822ee7a594867145e9818f2e5)

Conflicts:
	apps/settings/js/carrier.js
Merge pull request #10622 from ian-liu/sms/Bug881648_give_size_limitation_for_mms

Bug 881648 - [MMS] There is not maximum limit warning, r=@gnarf(cherry picked from commit 147240e7948e8710520bb3777d8707bcfa898c35)
Bug 840147 & Bug 877903 : fix orientation problem on open/close app animation.
                          * Open app by real device orientation
                          * Refactor setAppSize and rotateTransition to AppWindow
Bug 880588 - Don't remove inline activities when device is locked.
Merge pull request #10659 from alivedise/bugzilla/880588_v1-train

Bug 880588 - Don't remove inline activities when device is locked. r=timdream, a=leo+
Bug 887683: Cancel pick activity correctly while go to background.
Fix bug 883950 - r=gnarf

Closes gh-10648
(cherry picked from commit cee375743267335a4590cd4ba93b9129a179166d)
Merge pull request #9332 from ian-liu/clock/Bug842750_Alarm_label_in_French_not_localized

Bug 842750 - [B2G] [Clock] Default alarm name not localized r=timdream(cherry picked from commit 77db64fee5003b01fee9c1b0d149d124e9e20563)

Conflicts:

	apps/clock/js/alarm.js
Merge pull request #10668 from mozilla-b2g/v1_train/clock/Bug842750_Default_alarm_name_not_localized

Bug 842750 - [B2G] [Clock] Default alarm name not localized r=timdream(cherry picked from commit 77db64fee5003b01fee9c1b0d149d124e9e20563)
Bug 886757 - We need to load the operator size limit for MMS from the apn.json file - r=kaze

* Loading operatorSizeLimitation from apn.json on startup
* Tweak apn.json creator to load setting from operator_variant.xml
* Add values from TEF for operator_variant.xml
(cherry picked from commit 151a1a160d22236a4664440c2f504364ec4a8891)
Bug 887356 - Homescreen grid test failing on TBPL r=crdlc a=tests

This uses sinon to make this sometimes failing test synchronous.
(cherry picked from commit 12a6565c2a053f0d12af51a53ff4b825f4344981)

Conflicts:
	apps/homescreen/test/unit/grid_test.js