Bug 1065262 - [Lockscreen] No action is triggered on notification in lock screen with passcode enabled
bug 1064975 - ensure enter/leaveTaskManager is called for *all* applications even when stack is filtered. r=sfoster
Bug 1058900 - [email] Workaround graphics corruption / memory spikes by cleaning up HTML display logic. r=jrburke
Bug 1052447 - [Messages] when we're in an activity and we delete all messages in the thread, we should close the activity r=azasypkin
Bug 1056969 - New data/roaming alignment

Conflicts:
	apps/system/js/statusbar.js
Bug 1062168 - [Contacts] Not clearly Process when user does a search to set ICE contact,
Bug 1061690 - System dialogs are truncated if closed while the keyboard is being shown. r=alive
Bug 1068356 - Authentication screen remains indefinitely when long tapping on the homescreen button in the FxAccount login proccess. r=alive
Bug 1064898 - Time picker is not displaying AM/PM for 12 hours format after change locale
Bug 1068860 - Allow ModalDialog to display pure strings r=gandalf

We may need to have to display strings that are not localized and for
which it does not make sense to have localization at all. This happens
for network-generated messages that we have to display to the user, on a
CDMA network for example.

Conflicts:
	build/jshint/xfail.list
Bug 1069236 - fix attention notification style
Bug 1069997 - Implement the progress to spec for the updates notifications and prevent a constant restyle.
Merge pull request #24324 from snowmantw/issue1065262-v2.1

Bug 1065262 - [Lockscreen] No action is triggered on notification in loc...
Bug 1061444 - Keep the iccids and restore the apn settings when necessary
Bug 1068619 - [v2.2] [v2.1] Investigate test_browser_search failure
Merge pull request #24389 from viorelaioia/bug_1068619_v2.1_

Bug 1068619 - [v2.2] [v2.1] Investigate test_browser_search failure
Bug 1071707 - Remove browser dependency from marionette tests r=Cwiiis
Merge pull request #24354 from nullaus/bug1064975

bug 1064975 - ensure enter/leaveTaskManager is called for *all* applicat...
Revert "Merge pull request #24354 from nullaus/bug1064975"

This reverts commit a4c14a9a385af9957c0958667405d186e0c87a66, reversing
changes made to 9e28b533bc4f66bb8c440baacd7d807c50fee646.