Bug 992162 - [master] Fix test_lockscreen_unlock_to_camera_with_passcode.TestCameraUnlockWithPasscode
Bug 993388 - [Followup][Messages][Refresh] Messages Inbox edit mode
Bug 991953 - [Camera][Buri] Timer turns sideways or upside down when filming video
Bug 985498 - Investigate and fix test_delete_app fail on Travis
Bug 986833 - The cost control app doesn't work on b2g-desktop
Bug 968661 - Extract new build module webapp-shared.js from webapp-zip.js
Bug 993358 - Extra step in test_everythingme_app_install.TestEverythingMeInstallApp
Merge pull request #18104 from gitmai/bug-986833-cc-app-msg-no-api

Bug 986833 - The cost control app doesn't work on b2g-desktop
r=salva
Merge pull request #18111 from AndreiH/985498

Bug 985498 - Investigate and fix test_delete_app fail on Travis
Merge pull request #17975 from AndreiH/bug_992162

Bug 992162 - [master] Fix test_lockscreen_unlock_to_camera_with_passcode...
Bug 951687 - [Messages] Thread. Update file icon placeholders r=julien
Merge pull request #18078 from rnowm/993388

Bug 993388 - [Followup][Messages][Refresh] Messages Inbox edit mode r=julienw
Bug 992891 - [B2G][Messages] Warning message is missing while trying to attach a video file too large to send via MMS r=schung
Merge pull request #18121 from AndreiH/993358

Bug 993358 - Extra step in test_everythingme_app_install.TestEverythingM...
Revert "Merge pull request #17813 from evanxd/bug-987351"

This reverts commit 7efa9ab3234207fd2fd818a5c1411f390619dbfc, reversing
changes made to 89691d2d1a98aef25f3937fbe995413a5d943abe.
Merge pull request #18132 from gaye/disable-caldav-test

Revert "Merge pull request #17813 from evanxd/bug-987351"
Merge pull request #18090 from justindarc/bug991953

Bug 991953 - [Camera][Buri] Timer turns sideways or upside down when fil...
Revert "Bug 967516 - Enable DEVICE_DEBUG by default for non production builds r=ochameau" for assertions and timeouts

This reverts commit abda39c78b25d6dbcf8cc7eba2c59086871b5da1.
Bug 974554 - CalDAV parser should accept ical inside xml comments nested  in <calendar-data> elements r=millermedeiros
Merge pull request #18135 from gaye/bug-974554

Bug 974554 - CalDAV parser should accept ical inside xml comments nested in <calendar-data> elements r=millermedeiros