Bug 983074 - [MADAI][SMS] @2.25x assets update for SMS
Merge pull request #17838 from SasikalaParuchuri/Bug_984841_Keyboard_NotShown_inNewmessageScreen

Bug 984841 - [Messages] The cursor and the keyboard are not shown when New message screen is opened r=schung
Merge pull request #17850 from gasolin/issue-990561

Bug 990561 - [MADAI][System] @2.25x assets update for Emergency Call, r=greg
Revert "Merge pull request #17860 from mcav/alarm-volume-2"

This reverts commit 6e6cf2c0e135542da4aacce710cd534794b9627e, reversing
changes made to c648699d636414c50cf29ea3173058a0c78a855f.

Conflicts:
	apps/clock/js/panels/timer/main.js
Bug 973446 - [settings] refactor B2G improve and feedback panel with AMD pattern
Merge pull request #16108 from gurumukhi/master

Bug 910648 - Enable USB Storage should have one r=crh0716
Bug 984802 - [MADAI][System] @2.25x assets update for System
Merge pull request #17511 from cctuan/973446

Bug 973446 - [settings] refactor B2G improve and feedback panel with AMD...
Bug 959200 - Letters on keyboard sometimes not placed correctly.
Merge pull request #17848 from gasolin/issue-984802

Bug 984802 - [MADAI][System] @2.25x assets update for System, r=alive
Merge pull request #17870 from RudyLu/keyboard/Bug959200_master

Bug 959200 - Letters on keyboard sometimes not placed correctly.
r=janjongboom
Merge pull request #17821 from rnowm/990006

Bug 990006 - Change active state in dark themed [BB] buttons
Merge pull request #17812 from EverythingMe/989731-icon-size

Bug 989731 - [E.me] Web app icon sizes and shadow are inconsistent
Revert "Bug 986206 - Report filenames on test failures"

This reverts commit f54d933c592c229c74c7ea5a9582c17a931d75ae.
Bug 983077 - [MADAI][FMRadio] @2.25x assets update for FMRadio
[Bug 989023][Camera][Madai][Mozilla]Image Preview button needs highlight state
Bug 990985 - [master][v1.4] Let's xfail test_settings_airplane_mode.TestAirplaneMode
Bug 973448 - [settings] refactor Support panel with AMD pattern
Merge pull request #17354 from gasolin/issue-973448-2

Bug 973448 - [settings] refactor Support panel with AMD pattern, r=arthur
Bug 990448 - JSHint fixes for the controllers and models folders.