Merge pull request #15736 from fcampo/subject-too-high-bug963050

Bug 963050 - [SMS] Subject's line-height in composer is too high
r=julien(cherry picked from commit d876a70c6d96e8c67a26897d8d4d508407b7581d)

Conflicts:

	apps/sms/style/sms.css
Merge pull request #16116 from RudyLu/keyboard/Bug967857-Bengali_UI

Bug 967857 - Add specific CSS rules for Bengali - Probhat keyboard to
r=timdream(cherry picked from commit 31af75189710e8930be943dc96a4ccd339a6010f)

Conflicts:
	apps/keyboard/style/keyboard.css
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)
Merge branch 'v1.3' into v1.3t
Bug 970708: Create tarako demo reference workload.
Bug 835695 - Use jar reordering with core apps packages r=yurenju
Merge pull request #16123 from fabricedesre/reorder-zips

Bug 835695 - Use jar reordering with core apps packages r=yurenju
Merge pull request #15748 from wanderview/ogg-to-opus

Bug 964584: Convert vorbis files to opus to improve memory usage. r=timdream
Conflicts:

	apps/camera/js/config/sounds.js
	apps/camera/test/unit/sounds_test.js
Merge pull request #15774 from wanderview/opus-json

Bug 964768:  Fix opus file names in json files. r=fabrice r=21
Merge pull request #16153 from wanderview/tarako-workload

Bug 970708: Create tarako demo reference workload. r=timdream
Bug 835695 - Log files r=yurenju
Merge pull request #16154 from fabricedesre/log-files

Bug 835695 - Log files r=yurenju
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 branch 'v1.3' into v1.3t