Bug 1086285 - update licensing information for v2.1.
Bug 1079129 - [Woodduck] Lock screen is hidden by full screen prompt message
Bug 1079647 - [Woodduck][Downloads]Stopped file can not try again
Bug 1082936 - STK messages are seen overlapping each other. Patch v2.1
Bug 1086603 - Add test test_browser_navigation.py to share a link to the SMS app
Merge pull request #25606 from JohanLorenzo/bug-1086603-v2.1

Bug 1086603 - Add test test_browser_navigation.py to share a link to the...
Bug 1076613 - Separate the homescreen related thing from appwindowmanager as homescreenwindowmanager

Conflicts:
	apps/system/js/app_window_manager.js
Bug 1090092 - Add test for activating 4 column layout on homescreen
Merge pull request #25614 from chirarobert/uplift_home

Bug 1090092 - Add test for activating 4 column layout on homescreen
Bug 1081854: GAIA follow-up to Bug 978639 (for GCF case 31.4.2.1.3). r=drs
Bug 1084843 - For locales where first day of week is Monday, Repeat feature for alarms is broken.
Bug 1086988 - [2.1][l10n][Usage] Multiple locales: If byte count reaches 3 digits it overlaps the source text next to it
Bug 1087042 - Rocketbar progressbar position in fullscreen-app

Conflicts:
	apps/system/test/marionette/lib/system.js
Bug 1088462 - [System] Adjust statusbar min width on activityopened r=etienne
Bug 1089795 - [System] Layout problem with SHB in open file error dialog r=mhenretty

Conflicts:
	apps/system/test/marionette/lib/system.js
Bug 1074063 - Hide browser iframe on reviving
Bug 1082935 - Fixing scope problem with bluetooth transfer device name
Merge pull request #25596 from mpizza/Bug_1079647_disallow_failed_download_item_resume_v2.1

Bug 1079647 - [Woodduck][Downloads]Stopped file can not try again
Bug 1086674 - [2.1][l10n][Contacts] Multiple locales: The 'Add Picture' string is truncated on 'Add contact' screen.
Merge pull request #25063 from julienw/1081684-load-default-theme-when-a-theme-is-requested

a=npotb
Bug 1081684 - [Build] Themes don't load when running in Firefox r=ricky
(cherry picked from commit 2543927ea3bfa7ec23d4e9241f62c157e6b128d1)