Merge pull request #17535 from wanderview/contacts-canvas-cleanup-2

Bug 983885: Aggressively cleanup img/canvas in contacts. r=jmcf
Merge pull request #17320 from crdlc/bug-985132

Bug 985132 - [B2G][Homescreen]Input overlap with confirmation prompt whe...
Merge pull request #17648 from Archaeopteryx/settings-bug988296-imsSettingsHeader

Bug 988296 - imsSettings-header points to messageSettings, should be imsSettings ('Message settings' vs. 'IMS settings'). r=arthurcc
Merge pull request #17624 from hfiguiere/bug988114

Bug 988114 - Hardcode the sha1 we want for the gaia-node-modules. r=yuren,kgrandon
Merge pull request #17603 from mikehenrty/bug-975973-lite

Bug 975973 - [DSDS] The "data circle" icon is not made smaller for DSDS ...
(cherry picked from commit 4b6044162277ae481d26244e7441c0a16dc63e01)
Bug 974828 - [Settings][dsds] Outgoing data confirmation is wrong
Bug 990985 - [master][v1.4] Let's xfail test_settings_airplane_mode.TestAirplaneMode
Merge pull request #17880 from AndreiH/bug_990985

Bug 990985 - [master][v1.4] Let's xfail test_settings_airplane_mode.Test...
Bug 969101: Initial implementation of a first-time use ping. r=fabrice a=1.4+, bajaj
Merge pull request #17857 from marshall/ftuPing_v1.4

Bug 969101: Initial implementation of a first-time use ping
Merge pull request #17650 from gitmai/bug-988264-CC-messagehandler-error-networkInterface

Bug 988264 cc messagehandler error network interface
r=salva
Conflicts:
	apps/costcontrol/js/message_handler.js
Merge pull request #17665 from DouglasSherk/987211-clock-lock-call

Bug 987211 - [Dialer][Lockscreen] Fix clock being invisible when receiving a call while screen locked. r=rik
Bug 982789 - [B2G][Clock]Set Timer intermittently starts countdown at incorrect starting point. r=millermedeiros
Merge pull request #17916 from mcav/v1.4-timerrest

Bug 982789 - [B2G][Clock]Set Timer intermittently starts countdown at incorrect starting point. r=millermedeiros a=1.4+
Bug 980599 - [Camera] Picture and video resolution selection
(cherry picked from commit 7ca934f21b7e2ea027b7bb3ceb36d37c74072b5b)
Bug 980094 - [Camera] Moving setter and enabler methods from controls view to the view base class
(cherry picked from commit cf999a587818b1341a99ae6f6dc566bdd7afe14c)
Bug 980290 - [Camera] Bytes and pixels shouldn't be used interchangeably
(cherry picked from commit 2bca3e9afcbd6bb8fcdbac942817e917b1a3a6c7)
Bug 966839 - [Camera] Add frame grid to camera settings
(cherry picked from commit 7fe64a4838e3f07e9f129bac1905d5eb4fcd0920)
Bug 976203 - [Camera] Localization (l10n) missing from settings UI
(cherry picked from commit 93bd6d661e325990ba40963011cc45814409c79c)
Bug 976203 - [Camera] Localization (l10n) missing from settings UI
(cherry picked from commit 9da6b516809161d7a16895f00b8aa08ac03cfba2)