Merge pull request #21809 from yurenju/preferences

Bug 1039219 - Migrate all snippets for preferences in Makefile to preferences.js r=@gduan
Merge pull request #22666 from crh0716/1044405

Bug 1044405 - Should set a empty string if there are no text and l10n provided. r=alive
Bug 1015295 - [Keyboard] Update to use gaia-header
Bug 1048025 - Set pointer-events: none on child elements of keys
Merge pull request #22699 from timdream/keyboard-vwrapper-css2

Bug 1048025 - Set pointer-events: none on child elements of keys, r=rudyl
Merge pull request #22681 from nmunro/master

Bug 1048021 - Mass replace pageX/pageY to clientX/clientY for keyboard app, r=timdream
Merge pull request #22707 from snowmantw/issue1037284

Bug 1037284 - [NFC] Screen shows wired and NFC function broken when clic...
Merge pull request #22704 from timdream/hardwarebuttons-testfix

Bug 999605 - Fix intermittent error in HardwareButtons tests, r=kgrandon
Bug 1036830 - build failed if camera-config.js in distribution directory doesn't exist r=gduan
Merge pull request #22667 from mcjimenez/bug1049842_v2

Bug1049842 - Change downloadUdatesVia2GForbidden text (r = [flod, matej, alive] )
Fixes Bug 1032032 in build/test/integration/distribution.test.js
Merge pull request #22629 from viorelaioia/bug-1040063

Bug 1040063 - [v2.1][v2.0] Intermittent test_settings_do_not_track.py fa...
Bug 1032036 - Fix jshint error for build/test/integration/multilocale.test.js r=yurenju
Merge pull request #22675 from wilsonpage/1050801

Bug 1050801 - Update shared/elements/gaia-header/ to ~v0.3.0
Merge pull request #22565 from arvin-zhang/bug1046564_master

Bug 1046564: Should display normal priority message of STK_CMD_DISPLAY_TEXT command while device is Settings, r=alive
Bug 1051672 - Update tablet app list
Bug 1044744 - Move IFrame management in keyboard_manager.js to another script
Merge pull request #22595 from millermedeiros/1048953-html-escape-zero

Bug 1048953 - Calendar Day view fails when hour is 00:xx JavaScript error: app://calendar.gaiamobile.org/js/views/current_time.js, line 115: displayHour is null r=gaye
Bug 1024993 -  Run the CSS Linter in Travis/TBPL

Refactor the script to only report unknown problems
Bug 1024993 - Update CSS xfail list to be green