Bug 1079129 - [Woodduck] Lock screen is hidden by full screen prompt message
Bug 1082936 - STK messages are seen overlapping each other. Patch v2.1
Bug 1076613 - Separate the homescreen related thing from appwindowmanager as homescreenwindowmanager

Conflicts:
	apps/system/js/app_window_manager.js
Bug 1082935 - Fixing scope problem with bluetooth transfer device name
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)
Merge pull request #25610 from gmarty/Bug-1082935-Fixing-scope-problem-with-bluetooth-transfer-device-name

Bug 1082935 - Fixing scope problem with bluetooth transfer device name
Merge pull request #25379 from daleharvey/v2.1-1072531

Bug 1076613 - Separate the homescreen related thing from appwindowmanage...
Merge pull request #25520 from luke-chang/1079129_v2.1_fullscreen_prompt_overlay_lockscreen

Bug 1079129 - [Woodduck] Lock screen is hidden by full screen prompt message
Merge pull request #25607 from mancas/bug1082936_v2.1

Bug 1082936 - STK messages are seen overlapping each other. Patch v2.1
Bug 1088391 - Set orientation on callscreen opening
Bug 1091069 - Restoring the progress bar on the browser
Bug 1089221 - "ICE Contacts" in contacts list is hardcoded
Merge pull request #25516 from TheoChevalier/ice-contacts-hardcoded-2.1

Bug 1089221 - "ICE Contacts" in contacts list is hardcoded
Bug 1088389 - [Search] Remove divider shown when searching r=daleharvey
Bug 1081132 - Possible to get lock screen into landscape mode