Merge pull request #21574 from yurenju/camera-config

Bug 1036830 - build failed if camera-config.js in distribution directory... r=gduan
Bug 1050843 - [B2G][Contacts] Export contacts buttons are overlaying Settings menu page
Bug 1052300 - [Keyboard] Wrong keyboard may be activated after using IMESwitcher
Revert "Bug 1036830 - build failed if camera-config.js in distribution directory doesn't exist r=gduan"

This reverts commit c9fb6b5a763d744a991aa0b26a22ef988fde8ab7.
Merge pull request #22714 from yurenju/camera-config-2

Bug 1036830 - build failed if camera-config.js in distribution directory doesn't exist r=gduan
Merge pull request #22567 from RudyLu/keyboard/Bug1015309-symbol_layout_refinement

Bug 1015309 - Update the default and English symbol panel.
r=timdream.
Bug 1022609 - Define 2 different symbol panels that includes ',' or not.
 - Modify each layout to define supportsSwitching.
Bug 1050162 - [LockScreen] No SIM label when there is an incoming call
Bug 1052272 - TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/keyboard/test/marionette/uninstallation_test.js | Show Keyboard App after uninstallation "before each" hook
Revert "Bug 1050670 - verify output files from jsmin"
Merge pull request #22776 from mozilla-b2g/revert-22705-1050670

Revert "Bug 1050670 - verify output files from jsmin"
Bug 947198 - [DSDS][dolphin][OMA CP] Support for DSDS. r=Gabriele
Bug 1051852 - [Messages] use 'DOMContentLoaded' instead of 'load' to init the various resources r=schung
Merge pull request #22172 from gtorodelvalle/callscreen-bug-1043347-conference-participant-info-alignment

Bug 1043347 - [Dialer][Call Screen] Bad alignment of information in conference call overlay
Bug 1052341 - Fix intermittent failure in test_import_contacts_from_gmail.py
Bug 1052252 - Set the scrolling speed as 500 r=me
Merge pull request #22653 from dwi2/bug1047998

Bug 1047998 - [dialer] Long number is not showed properly
Bug 1051538 - Linking contact never ends
Revert "Bug 1043892 - [LockScreen] Solve the visual regression caused by Bug 1043821, with panel switching refactoring" for B2G emulator xpcshell failures

This reverts commit 5f7d9e2813bc4719919f5b6b52219295c56ebb13.
Merge pull request #22779 from viorelaioia/bug_1052341

Bug 1052341 - Fix intermittent failure in test_import_contacts_from_gmai...