Bug 1076327 - Ignore screenchange if lockscreen is not ready to be opened
Bug 1059546 - Set proper mozApps signed origins for eng builds r=rchien

Engineering builds needs to accept signed apps from stage Marketplace
for testing purpose. This depends on Gecko having a proper
setting-to-pref mapping for dom.mozApps.signed_apps_installable_from.

Conflicts:
	build/settings.js
Bug 1074683 - Status bar signal strength update triggers reflow/restyles
Merge pull request #25185 from Cwiiis/bug1061466-system-update-splash

Bug 1061466 - Show a splash screen when doing a system update. r=alive
Conflicts:
	apps/system/style/update_manager/update_manager.css
Bug 1082116 - [Camera] Face detection does not work after touch focus
Bug 1071366 - Add the missed case of erasing call forwarding settings
Bug 1065731 - When adding a number to an existing contact, search icon does nothing

Conflicts:
	shared/pages/import/style/search.css
Bug 1069438 - [Status Bar] Play icon sometimes shows up when camera in use icon is shown
Bug 1081319 - fixing statusbar icons wrapper visibility in full screen app mode. r=mhenretty
Bug 1083729 - Avoid callscreen window leakage r=etienne_s

Because of a platform bug, the callscreen window gets leaked in bfcache,
as documented on bug 1078448 and stated in comment 8. Adding an empty
'unload' event listener allows us to avoid the leakage.
Bug1082555-[Video]-Fix of currentVideo getting reset during suspend resume operation r=russn
Bug 1015853 - Changing theme should update wallpaper image r=arthurcc
Bug 1082667 - The minimised status bar width must consider the software home button
Bug 1079254 - [v2.2] Investigate test_number_keyboard intermittent failure
Merge pull request #25360 from gmarty/Bug-1082667-The-minimised-status-bar-width-must-consider-the-software-home-button-v2.1

Bug 1082667 - The minimised status bar width must consider the software ...
Merge pull request #25109 from alivedise/bugzilla/1076327_v2.1_v5b/onshowwindow-should-not-display

Bug 1076327 - Ignore screenchange event if lockcreen is not ready
Bug 1082456 - The buttons of the fullscreen permission dialog become "Don't share / Share" abnormally after the geolocation permission dialog is shown previously
Bug 1082885 - Make IME Menu SHB aware
Bug 1083541 - [Costcontrol] Showing error screen if card state is 'unknown'. r=mai
Bug 1080799 - Connecting to/joining (hidden?) Wi-Fi fails after factory resetting phone/first run, restart required. Patch v2.1