Bug 971624 - [settings] refactor marionette test for do not track panel
Bug 993832 - wrong multi-res resource file name
Bug 993807 - Making sure the MmiManager is initialized for network initiated MMI sessions.
Bug 969468: Enable NFC preference by default. r=arthurcc
Bug 988516 - Add waitForTextNotEmpty function in view.js.
Bug 988516 - Enable the "click after first hour" test.
Merge pull request #17963 from svic/Bug_969468

Bug 969468: Enable NFC preference by default.
Merge pull request #18217 from etiennesegonzac/bug-993807-network-initiated-mmi

Bug 993807 - Making sure the MmiManager is initialized for network initiated MMI sessions. r=rik
Bug 990580 - Workaround python launch() issue a=testonly r=me
Merge pull request #18255 from evanxd/bug-988516

Bug 988516 - [Calendar] Intermittent failing test, day view events longer than 2h click after first hour
Bug 995800 - [Calendar] Disable intermittent failing test on travis, configure CalDAV accounts
Revert "Merge pull request #18255 from evanxd/bug-988516"

This reverts commit 28933e686babd4d95b37e6056e4febc0480ff759, reversing
changes made to 68d8e6897f326a8980c81da80bf8a76440ef3faf.
Merge pull request #18264 from gaye/revert-28933e686babd4d95b37e6056e4febc0480ff759

Revert "Merge pull request #18255 from evanxd/bug-988516"
Bug 973436 - Refactor the battery panel using AMD modules
Merge pull request #18095 from gasolin/issue-993832

Bug 993832 - wrong multi-res resource file name, r=yurenju
Bug 987533 -  MockEventTarget extracted from MockDOMRequest, and MockInputMethod + tests
Merge pull request #17709 from timdream/mock-event-target

Bug 987533 - [keyboard refactor] breakdown MockEventTarget, MockInputMethod, and MockInputContext from input_field_test.js, r=janjongboom
Bug 983459 - Notify of no voicemail number when tapping voicemail notification

If we don't have any voicemail number (on the SIM card nor configured in
Settings), when the user is tapping on the voicemail notification,
nothing will happen. This is confusing, so we implement a modal dialog
to notify of the lack of voicemail number configured, and we add a link
to the Settings app to configure it.
Merge pull request #17948 from lissyx/bug983459

Bug 983459 - Notify of no voicemail number when tapping voicemail notification r=etienne,alive
Merge pull request #17913 from crh0716/973436

Bug 973436 - Refactor the battery panel using AMD modules r=evelyn