Bug 947977 - [Messages] Bug 936370 regressed the scrolling behavior when redacting a multi-line message r=schung
Bug 950469 - [Setringtone][l12y] 'Set as ringtone' string is reused on title and button
Bug 947259 - Fix waitForEvent: marionetteScriptFinished is called from the right sandbox.
Bug 947259 - Cleanup post review.
Bug 949897 - test_cards_view_kill_apps_with_two_apps.py intermittently fails
Bug 947957 - Enable test_quick_settings.py on Travis and TBPL
Travis bustage fix
Merge pull request #14752 from gregorwagner/back

Travis bustage fix.
Merge pull request #14710 from viorelaioia/bug_949897

Bug 949897 - test_cards_view_kill_apps_with_two_apps.py intermittently fails
Bug 890440 - Disable system workarounds for notification sent with the deprecated API

Notification which have been sent with the old API should not be treated
with the hacks and workarounds we implemented to circumvent its
limitations. So we detect whether a notification was sent from this
deprecated API based on the form of the id property.
Merge pull request #14707 from AndreiH/bug947957

Bug 947957 - Enable test_quick_settings.py on Travis and TBPL
Bug 950465 - [Clock][l12y] Snooze is reused in different contexts

r=jugglinmike
Bug 933131 - Message report panel implementation
Merge pull request #14676 from TheoChevalier/setringtone-reused-strings

Bug 950469 - [Setringtone][l12y] 'Set as ringtone' string is reused on t...
Bug 947259 - Fix missing semi-colon
Merge pull request #14719 from lissyx/bug890440

Bug 890440 - Disable system workarounds for notification sent with the deprecated API r=alive
Merge pull request #13654 from steveck-chung/message-information-page

Bug 933131 - Message report panel implementation. r=julienw
Merge pull request #14670 from julienw/947977-fix-scroll-when-typing

Bug 947977 - [Messages] Bug 936370 regressed the scrolling behavior when...
Merge pull request #14621 from hfiguiere/bug947259

Bug 947259 - Fix waitForEvent. r=julienw
Bug 944242 - Properly handle do-not-track options when upgrading from 1.1