Merge pull request #15686 from jmcanterafonseca/fix_oom_facebook

Bug 950295 - Facebook Import OOMs and kills itself when importing 500+ c...
Bug 963777 - Disable test_cards_view_kill_apps_with_two_apps.py on os=mac r=me a=testonly
Bug 958524 - Fix test_camera_flash_mode to run on manifest not in-test logic r=me a=testonly
Bug 964095 - DEVICE_DEBUG should set adb and devtools r=yurenju
Merge pull request #13212 from gitmai/bug-925566-contact-phone-without-type

Bug 925566 -A preloaded contact without a type specified for a phone num...
Merge pull request #15429 from pmclanahan/fix-basket-ftu-xhr-949170

Bug 949170: Fix FTU basket XHR. (r=fcampo)
Merge pull request #15706 from KevinGrandon/bug_964095_debugger_mode

Bug 964095 - DEVICE_DEBUG should set adb and devtools r=yurenju
Bug 964173 - [Messages] Remove the css animation 'peek' hack r=julien
Bug 962451 - [email] Start from activity, tap back from compose/message reader, empty message list
Bug 930440 - [Messages] Urls in a message are not highlighted when tapping on them r=julien
Revert "Bug 950080 - add grunt jsdoc generator to gaia"

This reverts commit 508f3b37a2ea0953d2817464f285ec1d8b08dd2e.

Conflicts:
	Gruntfile.js
	package.json
Merge pull request #15741 from gaye/backout-bug-9500080

Revert "Bug 950080 - add grunt jsdoc generator to gaia"
Revert "Bug 957932 - Add coverage checkbox for test-agent web interface"

This reverts commit 9270745f79b2c2195a13cb24902cb402b08ced06.
Merge pull request #15689 from russnicoletti/bug833438

Bug 833438 - Viewing video through activity doesn't pause after headset ..., r=johnhu
Merge pull request #15716 from timdream/background-color

Bug 948208 - Add black background on body before loadend, r=alive
Bug 964584: Convert vorbis files to opus to improve memory usage.
Bug 957932 - Add coverage checkbox for test-agent web interface
Merge pull request #15588 from crh0716/944601

Bug 944601 - Use getCardLockRetryCount properly r=evelyn
Merge pull request #15580 from crh0716/959971

Bug 959971 - Allows -1 as a valid retry count r=evelyn
Bug 913782 - [Keyboard] Build time default keyboard selection work for
3rd-party keyboard support
 - make build/settings.js read the default keyboard layout config

Bug 920431 - [keyboard] keyboard_layout.json should be customizable
  - Refine to make it adopt the config in distribution package