Bug 1020002: don't allow an activity choice that could subvert forward-lock
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.
Merge pull request #20469 from mnjul/v1.3

Revert "Merge pull request #19374 from mnjul/bug_1011645_lockscreen_pass...
Bug 1008026 - show thumbnail instead of full size image for v1.3
Merge pull request #19994 from JerryShih/bug-1008026-wallpaper-flickering-1.3

Bug 1008026 - show thumbnail instead of full size image, r=djf
Bug 1024979 - Fix package name in HTML report for v1.3. r=zcampbell
Merge pull request #20397 from jimporter/email-as-user-agent

Bug 880670 - [email/activesync] some ActiveSync implementations blacklis...
Merge pull request #20712 from davidflanagan/bug1026846

Bug 1026846: require the type parameter for FL app view activity r=amac
Bug 1028843 - Improve wait for b2g to be resistant to JavaScript exceptions. r=zcampbell
Bug 1030687 - Bump gaiatest-v1.3 version to 0.2. r=zcampbell
Merge pull request #20525 from asutherland/email-as-dev-id

Bug 825538 - [email/activesync] Need to allocate unique device ID's for multi-device access to ActiveSync. r=squib
Merge pull request #21003 from jimporter/email-as-download-body-failure

Bug 1009422 - [email/Activesync/hotmail] Apparent change in server behav...
Merge pull request #20828 from jrburke/bug1025727-email-cronsync-failsafe

Bug 1025727 - [email/cronysync] Failsafe abort/window.close after failed cronsync(s) r=mcav
Conflicts:
	apps/email/js/cards/compose.js
Revert "Merge pull request #20828 from jrburke/bug1025727-email-cronsync-failsafe"

This reverts commit e5f7bbd6b8ee0b0014d2fef73a4ef59b620acaed.
Bug 1025727 - [email/cronysync] Failsafe abort/window.close after (multiple?) failed cronsync(s)

From master commit e64d7adf507d0f0164988257d30600499b1e5776
Merge pull request #21070 from jrburke/bug1025727-v1.3-email-cronsync-failsafe

Bug 1025727 - [email/cronysync] Failsafe abort/window.close after (multiple?) failed cronsync(s) r=mcav a=bajaj
Bug 1015833 - [PTCRB][STK]27.22.4.1.1/2 DISPLAY TEXT, normal priority, Unpacked 8 bit data for Text String, screen busy case failed, r=vingtetun

Conflicts:
	apps/system/js/icc_worker.js