[Bug 851188] [B2G][Contacts] Cannot enable Facebook
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)
Merge pull request #8523 from borjasalguero/action_menu_proposal

Bug 848778 - [SMS] Create a 'generic' option menu for new features r=ssa...(cherry picked from commit 34ec6dd4092f8f6455ae7296f1d1a1a445c1164d)
Merge pull request #8245 from jugglinmike/fix-sms-on-ff18

Bug 843736 - [sms] Application broken when running with FF18 r=kgrandon(cherry picked from commit 3a9892be68a889231e8f6bd0ab3888409a4500c8)
Bug 845305 - [Perf] Add startup test for the template app

The template app sometimes launches faster than the the app opening transition,
so it exhibited a corner case where the window_manager would not call the
callback after killing an app.
(cherry picked from commit 54fb649be901c9117e2fa6d3fe577a83b54a7c4c)
Merge pull request #8517 from ian-liu/bluetooth/Bug838027_support_for_receiving_video_files_over_Bluetooth

Bug 838027 - [Bluetooth File Transfer][User Story] Support for receiving video files over Bluetooth r=djf(cherry picked from commit 7ae6f639c00da38257f1f80e03586961750d902f)
Merge pull request #8658 from mikeaich/bug850629

Bug 850629 - set date/time field in EXIF header, and save screenshots with local-time-based filenames r=djf(cherry picked from commit 8e0bf5115a75891bdfebfc980e52241780563fa9)
Merge pull request #8441 from arcturus/bug-847335

Bug 847335 - [FTU / Contacts] Integrate Gmail connector into FTU(cherry picked from commit b307f605ebba6a443422597fdcf09c37c62dc6d1)