Merge pull request #18048 from mikehenrty/bug-987458-queuemozapps

Bug 987458 - [B2G][Calendar] Only one alarm will fire and only one notif...
Conflicts:
	apps/calendar/js/notification.js
	apps/calendar/test/marionette/alarm_test.js
Bug 989852 - [Sora][STK]'OK ' item is grayed when execute 'Get input' with a default text and user input command., r=vingtetun
Merge pull request #17997 from mikehenrty/bug-988737-clear

Bug 988737 - SMS notifications do not clear when launching SMS app after... r=alive
Merge pull request #18162 from mikehenrty/bug-987458-1.4rebase

Merge pull request #18048 from mikehenrty/bug-987458-queuemozapps
Bug 994644 - [master] test_that_device_info_is_populated in failing on CI
Merge pull request #18229 from viorelaioia/bug_994644_v1.4

Bug 994644 - [master] test_that_device_info_is_populated in failing on C...
Revert "Merge pull request #17997 from mikehenrty/bug-988737-clear"

This reverts commit 32af2759f67252fa490d1f36f912b73a33481965.
Merge pull request #17207 from JerryShih/bug-974807-handle-lost-context-in-gallery-redo-when-lose-master

Bug 989847 - Handle webgl context lose/restore event for gallery editor mode r=djf(cherry picked from commit a55eb67d0659327a8e4b64099fc76a634823fecd)
Merge pull request #18240 from davidflanagan/bug989847-v1.4

Merge pull request #17207 from JerryShih/bug-974807-handle-lost-context-...
Merge pull request #18081 from frsela/STK/Bug989852_v1.4

Bug 989852 - [Sora][STK]'OK ' item is grayed when execute 'Get input' with a default text and user input command., r=vingtetun
Merge pull request #18004 from EverythingMe/992644-console-binding

Bug 992644 - EverythingME.log: Bind to window.console object [r=ranbena]
Merge pull request #17986 from lissyx/bug992129

Bug 992129 - Generate voicemail notifications that are DSDS compliants r=etienne_s
Merge pull request #18134 from justindarc/bug993043

Bug 993043 - [Camera][Buri] viewfinder stays zoomed in and doesn't resto...
Merge pull request #18190 from justindarc/bug991367

Bug 991367 - [B2G][Gallery] The Camera button remains active beneath the...
Merge pull request #18164 from wilsonpage/992341

Bug 992341 - [B2G][Camera] Double tapping in camera causes self-timer to
Merge pull request #18059 from davidflanagan/camera-preview

Bug 989361: better swipe handling for switching items in preview r=justindarc(cherry picked from commit fb29a8ea2d79c56cf2dda54ce2056e7e53644243)

Conflicts:

	apps/camera/test/unit/controllers/preview-gallery_test.js
Bug 994976 - Disable perma-red TBPL test, alarm > without alarm mocks create two events with simultaneous reminders r=me
Bug 994976 - Disable intermittent failing test, alarm > without alarm mocks create two events with simultaneous reminders

Conflicts:
	shared/test/integration/travis-manifest.json
Merge pull request #18245 from davidflanagan/camera-preview-v1.4

Merge pull request #18059 from davidflanagan/camera-preview
Merge pull request #18246 from justindarc/bug993512

Bug 993512 - [B2G][Camera] Retaking a photo will briefly display previou... r=djf(cherry picked from commit 4ffb7c8cb330fc22cba938223443f056c7bc03b8)