Bug 1065511 - guard against falsey unfilteredStack. r=etienne
Bug 1071852 - Fix home button action in task manager
Bug 1060191 - Web compat issues with window.open, add opener test case
Merge pull request #24454 from nullaus/bug1069452

bug 1069452 - Never take screenshot of closing AppWindow if part of home...
(cherry picked from commit 2834baf4c7e34fe6ef335f0469f6d0f593c5922b)
Merge pull request #24582 from nullaus/v2.1

Merge pull request #24454 from nullaus/bug1069452
Bug 1011584 - Bangladeshi Mobile Network's APN is not available in settings. r=jaoo
Bug 1064735 - Theme apps should be hidden on homescreen.
Bug 1057977 - [Status Bar] Remove AM/PM indicator

Conflicts:
	build/config/common-settings.json
Merge pull request #24503 from cctuan/1060191-v21

Bug 1060191 - Web compat issues with window.open, add opener test case
Bug 1073188 - [VerticalHomescreen] Catch errors when fetching icons r=crdlc
Bug 1071706 - Dark icons on lockscreen
Bug 1071510 - [NFC/sharing] Use shrinking* events to handle screenshot in AppWindow, r=alive

Conflicts:
	apps/system/js/app_window.js
Merge pull request #23968 from sfoster/v2.1-task-manager-bug-1065511

Bug 1065511 - guard against falsey unfilteredStack. r=etienne
Bug 1074446 - gaia-l10n builds for Portuguese locale (pt-PT)
Bug 1074262: workaround graphics bug with will-change:opacity
Merge pull request #24585 from davidflanagan/bug1074262

Bug 1074262: workaround graphics bug with will-change:opacity r=dmarcos
Merge pull request #24460 from shamenchens/Bug1071852-TaskManagerHomeButton

Bug 1071852 - Fix home button action in task manager, r=sfoster
Bug 1069974 - [Contacts] [ICE] Deleting ICE Contact 1 makes ICE Contact 2 to promote to position 1(cherry picked from commit 84c9fcb8c846203ede478c05886ef9fff9384f79)
Merge pull request #24605 from jmcanterafonseca/position_ice_contacts_21

Bug 1069974 - [Contacts] [ICE] Deleting ICE Contact 1 makes ICE Contact ...
Bug 1071632 - [Contacts] [ICE] ICE Group is not properly refreshed after removing all phone numbers of an ICE Contact

Conflicts:
	apps/communications/contacts/test/marionette/ice_test.js