Merge pull request #18413 from allstarschh/Bug996470

Bug 996470 - [NFC] Default NFC setting is ON. r=arthurcc
Bug 996528 - Revive gaia keyboard in firefox nightly. r=vingtetun
Bug 997360 - [Music] skip the audio channel test for tpbl
Merge pull request #18151 from RudyLu/keyboard/Bug956182-new_layouts

Bug 956182 - [keyboard refactor] convert layout files to new format.
r=timdream
JSHint cleaning, will be squashed
Bug 994575 - Add a call should always display the list of contacts
Merge pull request #18398 from zbraniecki/995960-hide-debug-l10n-keys

Bug 995960 - Hide l10n missing keys during make without LOCALE_BASEDIR s...
Merge pull request #18414 from dominickuo/bug-997360

Bug 997360 - [Music] skip the audio channel test for tpbl
Bug 988768 - [Sora][Message][MMS] Can't send messages with an attachment between 295 and 299KB r=schung

This changes the default setting in Gaia from 300KB to 295KB. This also
substracts 5KB from the setting taken in Gecko.
Merge pull request #18379 from justindarc/bug996513

Bug 996513 - [Flame][Camera] front camera can not work in master branch
Bug 997414 - [VDR][Clock] Apply new Buttons and Inputs [BB]
Merge pull request #18222 from julienw/993961-fix-camera-test-b2g

Bug 993961 - [Camera] Fix unit tests in B2G Desktop r=dmarcos
Bug 997673 - Small refactor of Python cost control app tests
Bug 996195 - [Camera][Madai][UX] Mode Switcher Icons should have the same size on both on and off states
Merge pull request #18369 from viorelaioia/bug_996693

Bug 996693 - Investigate and fix test_import_contacts_from_gmail
Merge pull request #18427 from dmarcos/bug996195

Bug 996195 - [Camera][Madai][UX] Mode Switcher Icons should have the sam...
Merge pull request #18390 from mcav/icon-repeated

Bug 992876 - Reply icon repeated. r=jrburke
Merge pull request #18343 from mcav/text-select

Bug 976197 - [B2G][Clock] Stopwatch button texts can be highlighted. r=gaye
Bug 978547 - [Clock] JavaScript functions should not rely on presence and position of localizable elements. r=millermedeiros
Bug 987383 - Make sure to deal with empty output so that JSON stay valid. r=