Bug 970235 - [v1.3] Xfail test_ftu_skip_tour() with Bug 965912
Merge pull request #16122 from chirarobert/v1.3_xfail_ftu_test

Bug 970235 - [v1.3] Xfail test_ftu_skip_tour() with Bug 965912
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)