Bug 865161 - [Call log] Creating new contact/Adding to an existing contact error (only v1.0.1) r=arcturus
Bug 863335 - Download Update via data screen update
(cherry picked from commit e69553c36894979e0be587fe2b172a8b6795d803)

Conflicts:

	apps/system/style/update_manager/update_manager.css
	shared/style/confirm.css
(cherry picked from commit b0aca0dd1e2955e11190ede725e1fb9ee596438b)

Conflicts:

	apps/system/style/modal_dialog/prompt.css
Bug 857837 - Enter NCK/CCK/SPCK popup should pop up at boot up if phone is in network/corporate/serviceprovider locked state r=jaoo

Get rid of the setTimeout ack now that Bug 849757 is fixed.

Warning: do not uplift if Bug 849757 is not uplifted.
(cherry picked from commit 3fa788342953f33ab980fa1ba28deba1a1b8e650)

Conflicts:
	apps/system/js/sim_lock.js
Merge pull request #9471 from asutherland/email-4k-fix

Bug 864867 - Keep track of partially fetched bytes now that we attempt larger or complete download of bodies r=asuth.(cherry picked from commit 5944dfb3fb724755fde23d6cccb0f1bfa218e065)
Merge pull request #9527 from dominickuo/bug-866578

Bug 866578 - [music] change the option of shuffle all from title to shuffleAll, r=timdream(cherry picked from commit c5582a1cd935cb96e9020652cd2b39ba4e6da49d)
Merge pull request #9423 from shellylin/bug-859596

Bug 859596 - When closing the paring window, fire a blur event to the in...(cherry picked from commit a866e79190991a0d4678c3e7e47ffdcc5cfc744e)
Merge pull request #9213 from samjoch/follow-up-bug-823414

Bug 823414 - B2G browser gradient value does not match the gradient found in Settings (followup) r=me(cherry picked from commit 208848fd6dd04c090df3b89c0a1a51282c4731f7)

Conflicts:
	apps/browser/style/images/drawer-header-background.png
	apps/browser/style/images/drawer-header-background@2x.png
	apps/browser/style/images/tabs-badge-background@2x.png
	apps/browser/style/images/tabs-list-background@2x.png
Merge pull request #9479 from vingtetun/836056

Bug 836056 - [Lockscreen] Lockscreen appears after reboot after settings...(cherry picked from commit f8658bd0714cea8a37eeb4a4f670932c6bf355ad)

Conflicts:
	apps/system/js/lockscreen.js
Merge pull request #9429 from albertopq/contacts-add-to-existing-v1.0.1

Bug 865161 - [Call log] Creating new contact/Adding to an existing contact error (only v1.0.1) r=arcturus
Merge pull request #9504 from evanxd/bug-864977

Bug 864977 - datetime input fields do not bring up the keyboard(cherry picked from commit d883ec8a5e2df23508b40726ee0f6ef27e04acca)
Bug 864516 - Refresh time displays only when they are visible

- Made the homescreen, lockscreen and status-bar stop refreshing their
  time displays when the screen is off or they are invisible
- Fixed timer-leaks caused by starting the same timer twice overwriting
  the previous one without cancelling it
- Made the statusbar clock reflect locale changes immediately
Merge pull request #9416 from etiennesegonzac/bug-828683-bt-queuing

Bug 828683 - Introducing a BT command queue to prevent the lost of BT(cherry picked from commit 533553f72a549ab003475da64ed7666c4898a9eb)
(cherry picked from commit 018f29dafb45e16241589e65abd0ece1c02f191c)
Bug 865411 - [SMS] Banner required to hold message when user reaches the Max Segments in SMS composer r=borja

* implement the notification according to UX and Visual design
* display this notification if we reach the max length
* disable the send button if over 10 segments, but keep it enabled if we have
  exactly the max length
* rewrote the enableSend function to make it more readable and manageable
* use the new markup loader in thread_ui_test.js, and make it global
(cherry picked from commit a64ee1c346e71d7ff64904fcfe7dfbd834f1877d)

Conflicts:
	apps/sms/index.html
	apps/sms/js/startup.js
	apps/sms/js/thread_ui.js
	apps/sms/locales/sms.en-US.properties
	apps/sms/style/sms.css
	apps/sms/test/unit/sms_test.js
	apps/sms/test/unit/thread_ui_test.js
Bug 862193 - [Buri][Notification][Language]Overlap on notification r=Etienne

patch for v1.0.1
Merge pull request #9490 from jedp/863417-prefs-for-persona-urls

Bug 863417 - Can now set toolkit.identity.uri as pref; r=fabrice, a=tef+
(cherry picked from commit 9dbb2d9ee919ea75d33be495ff710b7c3a3b24d9)

Bug 863417 - pref for identity ui, fix line too long; a=tef+
(cherry picked from commit f48d569231583b91118f1c9c848796259e35aa7b)

Conflicts:
	apps/system/js/identity.js
Merge pull request #9625 from jedp/v1.0.1

Bug 863417 - toolkit.identity.uri pref; resolved conflicts from v1-train
Merge pull request #9352 from fcampo/RemainingPinIntents-ussd

[dialer] Bug 860660 - PIN&PUK: Show counter of trials remain(cherry picked from commit 887cae7e556fc19722011f0674fdd4d4bfeacc3e)
Bug 861080 - [sms]can't select last sms. r=borjasalguero
(cherry picked from commit f5de114feb0a3690dcbe5e226345f4d242a14f97)
Merge pull request #9589 from lodr/bug-828298-avoid-negative-offsets

Bug 828298 - Fixig a problem in the algorithm closing a tag in mindgap.js
Cause r+(cherry picked from commit d6ab69091492a2743b50eae24f8965e5a07c9d1c)
Revert "Merge pull request #9352 from fcampo/RemainingPinIntents-ussd"

This reverts commit 69f273fb42b66174d621daaff1fd498775e1b2cc.