Merge pull request #15982 from gtorodelvalle/contacts-bug-966622-importing-from-vcf-file

Bug 966622 - [contacts] import hangs at N-1 of N contacts imported from vcf file on memory card/sd card
(cherry picked from commit 9e7058e2a521ebfd8cd84507663213aaf2063159)

Conflicts:
	apps/communications/contacts/js/utilities/vcard_parser.js
	build/jshint/xfail.list
Merge pull request #16126 from changm/bug968311

bug 968311 - Put Gallery App in scrollable background color. r=:21
Merge pull request #16127 from changm/bug968478

Bug 968478. Put scrollable opaque layer in calendar app. r=21
Bug 967272 - Introducing contact photo thumbnails for new contacts,
and using thumbnails wherever it makes sense.
r=arcturus, jmcf(facebook), julienw(sms), rik(dialer)

(cherry picked from commit 407761e5ec53387b55fa755888c88915d081120d)

Conflicts:
	apps/communications/contacts/test/unit/views/form_test.js
	apps/communications/dialer/test/unit/call_log_test.js
	apps/sms/test/unit/sms_test.js
	apps/sms/test/unit/thread_list_ui_test.js
	apps/sms/test/unit/thread_ui_test.js
Merge pull request #16138 from etiennesegonzac/bug-967272-contacts-thumbnail-uplift

Bug 967272 - Introducing contact photo thumbnails for new contacts,
and using thumbnails wherever it makes sense.
r=arcturus, jmcf(facebook), julienw(sms), rik(dialer)
Bug 963917: reduce Gallery memory use (and fix leak) while scanning

force software canvases for thumbnail and preview creation with willReadFrequently

Free canvas memory after creating a thumbnail

Make sure our thumbnail blobs are file-backed not memory-backed

update mediadb docs
Bug 969761: use device pixels when chosing camera preview size
Skip test_cards_view_with_three_apps.py due to it failing intermittently on device.
http://qa-selenium.mv.mozilla.com:8080/job/b2g.hamachi.mozilla-b2g28_v1.3.adhoc/6/Skip
Merge pull request #16172 from chirarobert/v1.3_skip_cards_view_test

Skip test_cards_view_with_three_apps.py due to it failing intermittently...
Merge pull request #16152 from davidflanagan/bug969761

Bug 969761: use device pixels when chosing camera preview size r=justindarc
Revert "Merge pull request #16127 from changm/bug968478"

This reverts commit 88bda206b1def5d4beac3be851c904414563bea3.
Revert "Merge pull request #16126 from changm/bug968311"

This reverts commit 32b7cf41d72e8d636fa84e768f2821407316b299.
Merge pull request #16121 from gtorodelvalle/v1.3-contacts-bug-966622-uplift

Merge pull request #15982 from gtorodelvalle/contacts-bug-966622-importing-from-vcf-file
Merge pull request #15063 from lissyx/bug956588

Bug 956588 - Make sure that we pass a blob when setting wallpaper r=etienne
(cherry picked from commit b902866e8f24f3b750f5eec3260ebe7edb1c647f)
Merge pull request #15429 from pmclanahan/fix-basket-ftu-xhr-949170

Bug 949170: Fix FTU basket XHR. (r=fcampo)
(cherry picked from commit 76dfda8bc562e87569b594df8a7b744571a61245)
Merge pull request #15808 from pmclanahan/send-language-to-basket-964342

Bug 964342: Send language setting to basket. (r=fcampo)
(cherry picked from commit a2fbd8f96a6d262393832f23897c09349d398981)
Merge pull request #16084 from flodolo/bug969193_okcostcontrol

Bug 969193 - [Cost Control] The string "Ok" is not localizable when launching cost control with a locked SIM
(cherry picked from commit f1aa7a363bc38040d0ad942e993d8641af8db752)
Merge pull request #16106 from flodolo/bug969978

Bug 969978 - Improve Italian keyboard layout (alternative chars for 'e' and '.')
r=rudylu
(cherry picked from commit 7a317b04529263e19a837d407aeae558d7a71aff)
Merge pull request #16031 from jmcanterafonseca/fix_gmail

Bug 962377 - [B2G][Contacts] User is unable to sign out of a gmail accou...
(cherry picked from commit d1e46d3b273c9926e87e00ec42ff115a2e1f4b7b)
Merge pull request #16160 from crdlc/bug-969170

Bug 969170 - [B2G][l10n]Buttons displayed in prompt after long pressing ...
(cherry picked from commit bf4e7addd174a222264f18c02795dd6d755b9d3c)