Bug 1065511 - guard against falsey unfilteredStack. r=etienne
Merge pull request #23874 from nullaus/bug1044125

bug 1044125 - Only capture screenshot and show overlay when edge gesture...
(cherry picked from commit 1503e1f9f7846a3813c057ce95c35ac22031027f)
Bug 1069270 - [v2.1] Fix test_sms_contact failure
Bug 1064648 - Hitting power button while the keyboard is invoked shows 1/2 of Homescreen
Bug 1059053 - [Messages][SMS] Icon in Message report is truncated
Bug 1061068 - [Contacts] ICE missing from top of the list when toggling the 'Order by last name' r=sergi
Bug 1062694 - [NFC] prevent to set home visible if there is no active attention window
Bug 1061331 - Dont persist meta application-name in browser. r=kgrandon
Bug 1064507 - [Cost Control][Usage] Returning to the Usage app displays a blank screen on a device set to 319MB memory
Bug 1066206 - [Search] When user tried to add a Rocketbar result to the homescreen the page opens silently in the background r=alive
Bug 1063311 - [Contacts] Warning page does not work when tap email in user contact
Basically reverts f695792496326679702a0b2f48a9c384fd47473a
Bug 1059470 - Fallback to favicon.ico. r=kgrandon

Conflicts:
	apps/system/js/app_chrome.js
Bug 1067427 - [Contacts] [Regression] Contacts photo / image are lost under certain interactions made by the user
Bug 1066869 - Do not wait transition to show contact photo anymore
Bug 1066654 - Set aria-pressed on Shift key
Bug 1067441 - Enable SHB on secured lockscreen apps
Fixing SHB visibility in app landscape mode r=kgrandon
Bug 1061679 - [Browser Chrome] Press states of back, refresh, cancel and overflow menu using the wrong icons r=epang
Merge pull request #24177 from chirarobert/fix_sms_test

Bug 1069270 - [v2.1] Fix test_sms_contact failure
Merge pull request #24217 from julienw/1038548-fake-timers a=tests

Bug 1038548 - Intermittent statusbar_test.js | system/Statusbar "after e...
(cherry picked from commit 01f39304bd4518400eb82cdbf72c457f047793a5)