[Bug 851188] [B2G][Contacts] Cannot enable Facebook
Bug 849441 - [B2g] [Webapps] The wrapper ends slowly causing the user to see the background
Merge pull request #8676 from crdlc/v1-train

Bug 849441 - [B2g] [Webapps] The wrapper ends slowly causing the user to...
Bug 839500; close identity iframe when not in use r=fabrice, r=benadida
(cherry picked from commit 19d99d5882c1571c63e7f2637f0dc8a64cda7099)
Bug 811860 - Add sound notification to sent message
(cherry picked from commit 5d40e508df9fe61018a3e45749a1957fe886a1a1)

Conflicts:
	apps/settings/index.html
	apps/settings/locales/settings.en-US.properties
	apps/sms/js/thread_ui.js
	build/settings.py
Merge pull request #8258 from KevinGrandon/bug_811860_sms_audio_perf

Bug 844205 - [SMS] Regression in startup time r=borjasalguero(cherry picked from commit d427c60fd9692573297ba27845bd5f67b5c8fb54)
Bug 813506 - [Call Log. UX VD] The 'no communications' scenario has the wrong spacing and type (r=basiclines).(cherry picked from commit c34f3af426d8d17448fdfbf6afb506986c3c520d)
Cannot enable Facebook
Merge pull request #8524 from ferjm/bug843309

Bug 843309 - paymentSuccess sometimes does not appear in scope (payment ...(cherry picked from commit f815f9271dde55dcf71d33d87149a8e4538cf09b)
Revert "Cannot enable Facebook"

This reverts commit a8c74dc208a4598fbd9d61eee0dcab05538765ed.
Merge pull request #7926 from crdlc/bug-837062

Bug 837062 - Threshold for tapping defined on build time [r=arcturus](cherry picked from commit 3c070039c0818e8dcab45fb90e8743c52e7d8f3d)
Merge pull request #8527 from KevinGrandon/bug_838032_alarms

Bug 848378 - Implement event alarm view and edit r=lightsofapollo(cherry picked from commit a2a9909391abf8d76dcac6b698b141aaf70c6be4)
Merge pull request #8602 from KevinGrandon/bug_850386_alarm_display

Bug 850386 - Ensure alarms are displayed properly r=lightsofapollo(cherry picked from commit f65f5c7182c62240af5d7c41e904db9df1f11135)
Merge pull request #8584 from KevinGrandon/bug_848379_alarm_default_settings

Bug 848379 - Implement default settings for alarms r=lightsofapollo(cherry picked from commit a83a2ae4f43a9a46211b60c9a6701fab26f05b58)
Bug 849908 - Handle alarm offsets

Conflicts:
	apps/calendar/js/views/modify_event.js
Merge pull request #8628 from lodr/bug-838556-ui-crash

Bug 820414 - Avoiding UI crash when changing the date to a previous date.
Cause r+ and tef+(cherry picked from commit 00f2a15d8995a12284f7038462249f819a8966cd)
Merge pull request #6873 from crh0716/818829

Bug 818829 - [Settings] The password field shoud be grayed-out/hidden is WiFi is shared with level security open r=evelynhung(cherry picked from commit 22f5874ffefdcfcfeb6217ed0be83da80352858e)
Bug 848224 - Remove UA override for dropbox.com r=fabrice
(cherry picked from commit 2730e245de8610776544130a91092201cd547b02)
Bug 848531 - Remove UA override for stackoverflow.com r=fabrice
(cherry picked from commit 2e5046572756ebda8907b325a49c867f70eab7ee)
Merge pull request #8620 from dm8tbr/master

Bug 796492 - Volume can be changed while phone screen is off, r=alive(cherry picked from commit 32707e2e742e978d1aa90e203d8100d7b9a4f3fa)