Bug 996455: use device pixels, not css pixels when determining if an EXIF preview is big enough
Bug 1011645 - [B2G][Lockscreen] When unlocking a phone with a passcode, the user will see a blank homescreen with no apps
Merge pull request #19956 from davidflanagan/bug996455

Bug 996455: use device pixels, not css pixels when determining if an EXIF preview is big enough r=pdahiya a=1.3+,hkoka
Merge branch 'v1.3' into v1.3t

Conflicts:
	apps/gallery/js/MetadataParser.js
Bug 962902 - Duplicate blob url wastes 125k in the system app. r=alive
Bug 1021414 - Purge PDF viewer in 1.3t branch directly
Bug 964280 - Add option to override b2g start timeout duration. r=dhunt
Bug 979248 - Fix default timeout in start_b2g method
Use milliseconds for script timeout. a=test-only
Bug 946652 - Merge LockScreen class into GaiaDevice class; r=zacc

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/gaia_test.py
	tests/python/gaia-ui-tests/gaiatest/gcli.py
	tests/python/gaia-ui-tests/gaiatest/tests/functional/lockscreen/test_lockscreen_wake_with_notification.py
Bug 979253 - Remove deprecated LockScren class from gaiatest
Bug 994176 - Create branched versions of marionette-client and consumer packages. r=bsilverberg
Merge pull request #20123 from mnjul/bug_962902_duplicate_blob_url_in_system_app_v1.3t

Bug 962902 - Duplicate blob url wastes 125k in the system app.
Merge branch 'v1.3' into v1.3t
Merge pull request #20041 from davidflanagan/bug1020273

Bug 1020273: make the Gallery crop handles more sensitive r=pdahiya(cherry picked from commit a44346be68f23782d6b24426ed085d62856f9273)
Merge pull request #20172 from davidflanagan/bug1020273-v1.3t

Bug1020273 v1.3t
Merge pull request #20129 from timdream/remove-pdfjs-v1.3t

Bug 1021414 - Purge PDF viewer in 1.3t branch directly, r=vingtetun
Merge pull request #19404 from mnjul/bug_1011645_lockscreen_passcode_camera_button_stall_v1.3t

Bug 1011645 - [B2G][Lockscreen] When unlocking a phone with a passcode, the user will see a blank homescreen with no apps - v1.3t