Bug 1065511 - guard against falsey unfilteredStack. r=etienne
 Bug 1062730 - [NFC] Home button could not work well after receiving multiple websites which are shared via NFC
1. publish activeappchanged when app is changed in app_window_manager.js
2. stop tiltiing effect if receiving activeappchanged event
Bug 1066015 - [Camera] black screen when press power key as soon as you open a camera app
[v2.1] Bug 964037 - (gaia-rtl) Support RTL for Lockscreen App
Bug 1066339 - Use CSS variables for statusbar height r=alive
Bug 1068659 - Resizing no-data icon
Bug 1071064 - [Contacts] [ICE Settings] Even if Select ICE Contact button is disabled it can be clicked

Conflicts:
	apps/communications/contacts/test/marionette/ice_test.js
Merge pull request #24388 from cctuan/1062730-v21

 Bug 1062730 - [NFC] Home button could not work well after receiving multiple websites which are shared via NFC
Merge pull request #24406 from justindarc/bug1066015-v2.1

Bug 1066015 - [Camera] black screen when press power key as soon as you ...
Bug 1070895 - Pressing ENTER in search box clears search and returns back to inbox
Bug 1061440 - Provide an option for restoring only apn items instead of the entire apn settings

Conflicts:
	apps/settings/js/modules/apn/apn_settings_manager.js
Bug 1071064 - Add assert require to ice_test.js. a=bustage
Bug 1073019 - Move import of BluetoothHost into the test to avoid a test run crash
Merge pull request #24471 from bebef1987/bt_up

Bug 1073019 - Move import of BluetoothHost into the test to avoid a test...
Bug 1065062 - [Settings][Downloads] 'Select/Deselect All' buttons are missing from Downloads Edit page. r=arthur.chen

Conflicts:
	apps/settings/test/unit/downloads_list_test.js
Bug 1071942 - Do not hide statusbar opacity when rocketbar is focused r=alive
Bug 1061621 - When creating screen lock passcode, passcode doesn't matched.
bug 1062136 - getScreenshot should check for frontWindow. r=alive
Bug 1072231 - Adjusting height of generic dialogs to compensate for SHB r=etienne
Bug 1073534 - Include Contacts properties files in Callscreen to get their "cancel" keys. r=Rik