Bug 939197 - [Clock] Alarms need volume control. r=millermedeiros
Bug 987142 - [CostControl] Fix jshint errors (second part)
Bug 990334 - Set the correct css selector for the current day item.
Bug 990578 - [CostControl] Recompress images for madai
Bug 989357 - Recompressed the new application icons r=crdlc,ran
Merge pull request #17810 from gitmai/bug-987142-CC-jshint-fix-2

Bug 987142 - [CostControl] Fix jshint errors (second part)
r=jmcf
Merge pull request #17852 from gitmai/bug-990578-CC-recompress-images

Bug 990578 - [CostControl] Recompress images for madai
r=arnau
Bug 938896 - Find My Device client.
Merge pull request #17762 from gabrielesvelto/bug-989357-recompress-application-icons

Bug 989357 - Recompressed the new application icons r=crdlc,ran
Bug 988610 - [Camera][Madai] Black screen when opening camera from lockscreen and camera app isn't open
Merge pull request #17730 from justindarc/bug988610

Bug 988610 - [Camera][Madai] Black screen when opening camera from locks...
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
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