Bug 865161 - [Call log] Creating new contact/Adding to an existing contact error (only v1.0.1) r=arcturus
Bug 863127 - Dont show SPN if same as network name, r=@timdream, a=tef+
uplift
Bug 852468 - [Gallery/Camera] Gallery is shown deleted files after deleting from “Video shot list", r=djf, a=tef+
Merge pull request #9372 from RudyLu/contacts/Bug854814_label_localization

Bug 854814 - correctly localize the labels of each field in contacts. r=albertopq(cherry picked from commit b23c5dbe6e6b53ba802fbb714667fc13e32f666c)
Merge pull request #9170 from jmcanterafonseca/fix_trim

Bug 861707 - TypeError: contact.givenName[0].trim is not a function(cherry picked from commit 5169151672faa4040a4ad815667a519d8e631f07)
(cherry picked from commit 39416748d3ff5a9fc8127b141c5ea820249e12c6)
Merge pull request #8967 from mcirlanaru/bug_835972

Bug 835972 - Display SIM PIN dialog (if SIM card locked) for apps that ...(cherry picked from commit b126eeb39ed9bfa1e5662386f74611d5d6527b18)

Conflicts:

	apps/system/js/sim_lock.js
(cherry picked from commit 30620a3a7aff89b603a73a0265b668479955aa50)
Merge pull request #9186 from mcirlanaru/bug_861206

Bug 861206 - Don't prompt for SIM PIN entry if Settings app is opened(cherry picked from commit 9944dd8671c305a0be62d9cef918e022e5184ac0)
Merge pull request #9446 from comoyo/863127_1.0.1

Bug 863127 - Dont show SPN if same as network name, r=@timdream, a=tef+
Bug 865125 - [sms] The user can still enter characters in the input while the alert is shown, even when it's supposed to be full r=borja
(cherry picked from commit b742c91a1629d90067af454c4bef1e7480cc67d5)
Merge pull request #9216 from davidflanagan/bug861965

Bug 861965 - remove idle time during metadata parsing and prevent zooming while scanning large images r=gal(cherry picked from commit 3463dc01096e5423be6d08dc2f71f62c12ffbb45)
Merge pull request #9442 from EverythingMe/bugfix-add-to-homescreen-multiple

[Bug 866502] Only allow apps to be added to homescreen once [r=crdlc](cherry picked from commit 8050f595ff501eba45daeadb158e69ce80c83fa6)
Bug 867064 - Fix homescreen panning test due r=crdlc a=npotb

Move from mouse events to touch events.
Send both event types so that we won't fail in some situations.

also mock requestAnimationFrame in the suiteSetup instead of setup.
(cherry picked from commit f317b4afa829448177bdac9a00248eff10cf572e)

Conflicts:
	apps/homescreen/test/unit/grid_test.js
Bug 843877 - Remove facebook.com UA override r=fabrice
(cherry picked from commit f8b39ac058ce0a73006805df81455d101d971901)
Bug 865091 - Enable systemXhr so youtube bypasses CORS. r=daleharvey
(cherry picked from commit 8757b15adc8a9e3cfeed4283fc7802964af9c35e)
Bug 842349 - disable travis except master
Merge pull request #9457 from gtorodelvalle/dialer-bug-866690-call-log-breaks-if-no-sim-card

Bug 866690 - [Dialer] Call Log broken due to mcc being null if no SIM (r=etiennesegonzac).(cherry picked from commit 8278a62077e7561813b0ff041ce2e5c846eecb70)
(cherry picked from commit e420d71c9528786621f176fb4ce67d291e0a530e)
Merge pull request #9506 from yurenju/bug842349-v1.0.1

Bug 842349 - disable travis except master r=vivien a=NPOTB
Bug 863196 - Workaround on FTU and active audio channel to avoid the
power-on clip is too short.
Merge pull request #9510 from alivedise/bugzilla/863196_v1.0.1

Bug 863196 - Workaround on FTU and active audio channel to avoid the power-on clip is too short. r=yurenju, a=blocking-b2g:tef+
Merge pull request #9469 from asutherland/email-addressparser-apostrophe

Bug 866996 - [email] update addressparser node-dep to not think apostrophes are trying to quote display names. r=asuth(cherry picked from commit b9583de0462c6b126921d317bc9a36c3ab264605)