Bug 939197 - [Clock] Alarms need volume control. r=millermedeiros
Bug 990334 - Set the correct css selector for the current day item.
Bug 938896 - Find My Device client.
Bug 990653 - [Camera] Update unit tests for Activities
Bug 978553 - Don't try to insert the message body if the activity didn't populate it r=julienw
Revert "Bug 988079 - [Calendar] day view sometimes adds duplicated days to the DOM"

This reverts commit 277ef605c8f8305fe91a65559bfe35ca3458852b.

Conflicts:
	apps/calendar/test/marionette/day_view_test.js
	apps/calendar/test/unit/views/day_test.js
Bug 989785 - apps/calendar/test/marionette/week_view_test.js failing because of week view regression
Merge pull request #17855 from justindarc/bug990653

Bug 990653 - [Camera] Update unit tests for Activities
Revert "Merge pull request #17810 from gitmai/bug-987142-CC-jshint-fix-2"

This reverts commit 53cdd2b2d8d820d242d3fbccb32c73fb2c9515b0, reversing
changes made to 047855a5e077e9931a864cc2fe802eb42991826b.
Merge pull request #16183 from mcav/alarm-volume

Bug 939197 - [Clock] Alarms need volume control. r=millermedeiros
Bug 982789 - [B2G][Clock]Set Timer intermittently starts countdown at incorrect starting point
Merge pull request #17831 from millermedeiros/989785-backout-duplicated-dom

Bug 989785 - apps/calendar/test/marionette/week_view_test.js failing because of week view regression r=gaye
Bug 959694 - Combine Rocketbar and statusbar
Revert "Merge pull request #16183 from mcav/alarm-volume"

This reverts commit bb7e44e428640f15e1c07b0ab89c712e797fb9ea, reversing
changes made to 6274b3645b3d41df4aa5a55398b5d106edf1c528.
Merge pull request #17846 from evanxd/bug-990334

Bug 990334 - [Calendar] Newly perma-red marionette test, marionette/today_test.js
bug 982006

* Use new error nsresult values in download notifications.
* Update mock_download_ui.js based on addition of 'ERRORS' to DownloadUI.
* added tests for new Downloads API errors in download notifications test
* added new tests for modal dialog changes in app modal dialog test
* AppModalDialog will ignore titles that contain the application URL or origin and instead
  use the app name if it is available. If not, it will simply use an empty string.

r=alive, crdlc
Merge pull request #16262 from benfrancis/959694-master

Bug 959694 - Combine Rocketbar and statusbar r=kgrandon r=alive
Merge pull request #17303 from nullaus/bug982006

bug 982006
Bug 939197 - [Clock] Alarms need volume control. r=millermedeiros
Merge pull request #17849 from guilherme-pg/findmydevice

Bug 938896 - Find My Device client.