Merge pull request #8879 from fabi1cazenave/confirmPIN-bug854031

bug 854031: missing l10n-id attributes for the “Confirm New PIN” message, r=etienne(cherry picked from commit 452eaff2d2f25eda3addee8833df2aaaf7cbcdd3)
Merge pull request #9210 from fabi1cazenave/uplift-v1train-bug854031

Merge pull request #8879 from fabi1cazenave/confirmPIN-bug854031
Merge pull request #9172 from xiupinglong/master

Bug 853756 - [Buri][WIFI]The icon display wrong after connected to AP(cherry picked from commit bc54b1482e32245ec5d8ff1316c77b6c1d968dc6)
Merge pull request #9181 from marcofreda527/master

Bug 845660 - [Call] Proximity sensor shouldn't work on speaker/BT SCO mode in call, r=@timdream(cherry picked from commit 70c13d2f583c6578037b0b65c47cd55f2ce1ce1c)
Merge pull request #9180 from jmcanterafonseca/fix_settings2

Bug 861843 - Intermittent issue: Contact Settings screen does not appear...(cherry picked from commit d10e892eb6887967803a68e8c441a7c456446437)
Merge pull request #9215 from etiennesegonzac/bug-850119-simple-fix

Bug 850119 - Prevent the callscreen from sliding inside the view if the(cherry picked from commit 3de103f3ae4a91dc44804a536e74bfbbd7a8f1fc)
Merge pull request #9193 from rwldrn/862061

Bug 862061 - [SMS][MMS] contacts without a phone number entry will break the SMS app r=julien(cherry picked from commit df823b637aabc4c7df28dc0ed3a09689e842da28)
Merge pull request #9166 from leob2g/Bug_830901_App_Updates_refresh_download_button_on_showDownloadPrompt

Bug 830901 - [App Updates] Disabling all checkboxes in the update prompt... r=julien(cherry picked from commit 671e2b3a0ac28c77930a795414df48c7d6690359)
Merge pull request #8970 from Archaeopteryx/patch-1

Bug 830572 - MAC address label overlaps value, r=kaze(cherry picked from commit d0d350489a63bd01c57c1e2ce38c758739073221)
Merge pull request #9244 from fabi1cazenave/uplift-v1train-bug830572

bug 830572: uplift on v1-train
bug 861215 - add missing pukArea DOM element back

and fix some style problem
Bug 859661 - use DOMCursor instead of SmsCursor. r=julienw, a=leo+ (cherry-picked from commit e13c4277d880de1e29b74f80fe7e8e1a59664317)
Bug 859662 - Cursor based getThreads(). r=julienw, a=leo+ (cherry-picked from commit a77354cfa6cdae674f029def7ad7044492fb68a2)
Merge pull request #9256 from vicamo/bugzilla/859661/v1-train

Bug 859661 - use DOMCursor instead of SmsCursor. r=julienw, a=leo+ (cher...
Merge pull request #9257 from vicamo/bugzilla/859662/v1-train

Bug 859662 - Cursor based getThreads(). r=julienw, a=leo+ (cherry-picked...
Bug 862900 - remount system partition when doing |make reset-gaia|, r=@ochameau, a=NPTOB
Merge pull request #9253 from evelynhung/issue-861215-v1-train

bug 861215 - add missing pukArea DOM element back
Merge pull request #8555 from pivanov/bug-845061

Bug 845061 - Mail Settings Layout and Type Updates(cherry picked from commit 3b7fb2faf6fd7c4fb1ff568f7978e56fda1f6061)

Conflicts:
	apps/email/index.html
	apps/email/style/setup-cards.css
Merge pull request #9283 from fabi1cazenave/localizationNote-bug860530

bug 860530: add a “LOCALIZATION NOTE” to the email.en-US.properties file, r=stas(cherry picked from commit c9b550dae8a5ce6815466a94d1cbea89dab199fd)
Merge pull request #9285 from fabi1cazenave/bug860530-v1train

Merge pull request #9283 from fabi1cazenave/localizationNote-bug860530