Bug 1065511 - guard against falsey unfilteredStack. r=etienne
Bug 1071852 - Fix home button action in task manager
Bug 1060191 - Web compat issues with window.open, add opener test case
Revert "Bug 1065519 - Ambient indicator based on list of notifications"

This reverts commit b7b59f0fd59d9aaeeedb209945865da893b37f3c.
Bug 1055038 - False positive in test_lockscreen_unlock_to_camera
Merge pull request #24559 from chirarobert/uplift_camera

Bug 1055038 - False positive in test_lockscreen_unlock_to_camera
Bug 1068559 - Use auto focus completed callback to get focus state after moving.
Bug 1072203 - [Contacts] [Facebook] Friends list proposal for linking seems to be visually incorrect
Bug 1071727 - [Gallery] - Fix for gallery pick activity while USB is plugged and than disconnected r=djf
Bug 1060577 - Adjust Rocketbar backdrop opacity when displaying results
Bug 1065519 - Ambient indicator based on list of notifications
Merge pull request #24454 from nullaus/bug1069452

bug 1069452 - Never take screenshot of closing AppWindow if part of home...
(cherry picked from commit 2834baf4c7e34fe6ef335f0469f6d0f593c5922b)
Merge pull request #24582 from nullaus/v2.1

Merge pull request #24454 from nullaus/bug1069452
Bug 1011584 - Bangladeshi Mobile Network's APN is not available in settings. r=jaoo
Bug 1064735 - Theme apps should be hidden on homescreen.
Bug 1057977 - [Status Bar] Remove AM/PM indicator

Conflicts:
	build/config/common-settings.json
Merge pull request #24503 from cctuan/1060191-v21

Bug 1060191 - Web compat issues with window.open, add opener test case
Bug 1073188 - [VerticalHomescreen] Catch errors when fetching icons r=crdlc
Bug 1071706 - Dark icons on lockscreen
Bug 1071510 - [NFC/sharing] Use shrinking* events to handle screenshot in AppWindow, r=alive

Conflicts:
	apps/system/js/app_window.js