Bug 1102789 - [Contacts] MS freeze when import contacts from memory card to phone
Bug 1082444 - Handle additional events when FxA EntrySheet is displayed. r=ferjm

  * Specifically, listen for 'home', 'holdhome', and 'activityrequesting', and
    when those are caught, if the EntrySheet is open, close it.
  * Also, don't try to open the EntrySheet if navigator.onLine is false; show
    an error message instead.
Bug 1073806 - In Gaia, bypass system-resize in LayoutManager in window resize event if Keyboard is showing and we've just changed orientation

Conflicts:
	apps/system/js/layout_manager.js
	apps/system/test/unit/layout_manager_test.js
Bug 1106977 - [Woodduck][LockScreen] unlock screen twice new received sms notification disappeared
Bug 1044484 - Add an external tag to gaiatest manifests to denote tests use of external internet resources
Merge pull request #26714 from zacc/bug_1044484_v2.0

Bug 1044484 - Add an external tag to gaiatest manifests to denote tests ...
Merge pull request #26707 from mnjul/bug_1073806_v2.0

Bug 1073806 - In Gaia, bypass system-resize in LayoutManager in window resize event if Keyboard is showing and we've just changed orientation
Bug 1105857 - [Messages] User doesn't receive any notification about incoming message if native modal dialog is shown. r=schung
Bug 1106956 - Remove Notifications from IDLE TEXT during starting gaia.
Bug 1059224 - Update launch method with manifest_url option. r=dhunt r=bsilverberg a=test-only
Bump gaiatest-v2.0 version to 0.4. a=test-only
Bug 1090674 - [Flame][Woodduck][v2.0][Message]Two buttons will flash about 0.5s at bottom after you confirm no contact can be added as message recipient
Merge pull request #26549 from azasypkin/v2.0m-bug-1105857-alert-custom-dialog

Bug 1105857 - [Messages] User doesn't receive any notification about incoming message if native modal dialog is shown. r=schung
Merge pull request #26754 from davidflanagan/bug1096839

Bug 1096839: add BMP support to shared/js/media/image_size.js to fix Gal... r=pdahiya
Merge branch 'v2.0' into v2.0m

Conflicts:
	apps/system/js/layout_manager.js
Merge pull request #26867 from weilonge/seanlee/STK/v2.0m/Bug1106956

Bug 1106956 - Remove Notifications from IDLE TEXT during starting gaia. r=frsela
Bug 1092019 - The check icon will be covered by "Mirrored English" after you change to "Mirrored English" language.
Merge pull request #26868 from mpizza/Bug_1092019_ftu

Bug 1092019 - The check icon will be covered by "Mirrored English" after you change to "Mirrored English" language. r=sfoster.
Bug 1106450
1. Use icc.getConnection to get a connection for multi-sim cases.
2. Send STK_RESULT_PRFRMD_LIMITED_SERVICE when there is no cell object
of connection during handling STK_CMD_PROVIDE_LOCAL_INFO command.
Merge pull request #26875 from weilonge/seanlee/STK/v2.0m/Bug1106450

Bug 1106450 - Fix the issue of multi-sim and missing cell object of connection. r=frsela