Bug 1000337 - Correct notification title checking in integration test a=tests-only
Merge pull request #19878 from julienw/1000337-v1.3-fix-notifications-test

Bug 1000337 - Correct notification title checking in integration test
need to use marionette_client_mozilla_b2g28_v1_3 instead of tip marionette_client
Merge pull request #19891 from malini/v1.3

Bug 994176  -need to use marionette_client_mozilla_b2g28_v1_3 instead of tip marionet...
Revert "Merge pull request #19891 from malini/v1.3"

This reverts commit ca34a11e16c3583eda059a7fea7d88acc67f83a4, reversing
changes made to 56f15bef5b23dcb239bfa14bd691f530ab46e603.
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
Bug 1020002: don't allow an activity choice that could subvert forward-lock
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
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 #19374 from mnjul/bug_1011645_lockscreen_passcode_camera_button_stall_v1.3

Bug 1011645 - [B2G][Lockscreen] When unlocking a phone with a passcode, the user will see a blank homescreen with no apps - v1.3
Merge pull request #20258 from jonallengriffin/bug1023001

Bug 1023001 - Use * as maxVersion for b2gdesktop extensions, a=RyanVM
Merge pull request #20093 from davidflanagan/bug1020002-v1.3

Bug1020002 v1.3
Merge pull request #19464 from petervanderbeken/1013802

Bug 1013802 - Include utils.js in hotspot_test.js so that openDialog is defined r=crh0716
(cherry picked from commit 1b5ea790c10f3ae4fc1c08f04df8c59777b3ef73)

a=tests
Revert "Merge pull request #19374 from mnjul/bug_1011645_lockscreen_passcode_camera_button_stall_v1.3"

This reverts commit e74f2080cc58e78957809305a27afdc1b062f876, reversing
changes made to e049de79ff46fcab51f29a88d5869c5efb48fc3c.