Bug 1059683 - Report one less pixel from KeyboardManager for ceiling due to dpx
Bug 1061135 - Re-enable the tests
Bug 1065323 - 'Add' button is not localizable in FDN - Authorized Numbers
Bug 1063601 - Don't show indicator with tray open
Bug 1043408 - Use marionette-apps version 0.3.9
Bug 1053703 - Merge pre-app.js, app.js and post-app.js to one javascript file r=gduan

Conflicts:
	Makefile
Merge pull request #23892 from evanxd/bug-1061135

Bug 1061135 - Re-enable the tests r=me
Merge pull request #23934 from evanxd/bug-1043408

Bug 1043408 - Use marionette-apps version 0.3.9 r=me
Bug 1065886 - fix jsdoc build errors
Merge pull request #23940 from gasolin/issue-1065886

Bug 1065886 - fix jsdoc build errors, r=me
Merge pull request #23751 from mnjul/bug_1059683_concept_layout

Bug 1059683 - Report one less pixel from KeyboardManager for ceiling due to dpx fractions. r=timdream
 Bug 1062105 - [Keyboard] Alternate keys list overflows needs UI
 improvement.
  - Add border to multi-row alternatives char menu.
  - Adjust the positioning of the menu to align with the key row
    underneath.
Merge pull request #23906 from flodolo/bug1065323

Bug 1065323 - [Settings] 'Add' button is not localizable in FDN - Authorized Numbers r=arthurcc
Merge pull request #23832 from yurenju/merge-build-apps-2

Bug 1053703 - Merge pre-app.js, app.js and post-app.js to one javascript...
Bug 1065908 - Incorrect position of buttons in export/import options
Bug 1064419 - [Contacts][Facebook] Facebook contacts imported without a profile picture displays incorrectly in Contacts app
Revert "Bug 1053703 - Merge pre-app.js, app.js and post-app.js to one javascript file r=gduan" for build failures

This reverts commit 79e9bfc0994fada5e0cd0909a0bf7e553ccd7516.
Merge pull request #23851 from RudyLu/keyboard/Bug1062105

Bug 1062105 - [Keyboard] Alternate keys list overflows needs UI improvement.
r=timdream
Merge pull request #23942 from jmcanterafonseca/fix_buttons_export_import

Bug 1065908 - Incorrect position of buttons in export/import options
Merge pull request #23944 from crdlc/bug-1064419

Bug 1064419 - [Contacts][Facebook] Facebook contacts imported without a ...