Bug 1071451: [AUM] Handle attention windows properly so phone calls are counted. r=djf
Bug 1081748 - [Contacts] Deleting a comment on a contact collapses the whole comment thread on edit screen
Bug 1080557 - Update test_browser_bookmark.py to delete the bookmark added
Merge pull request #24899 from etiennesegonzac/bug-1079379

Bug 1079379 - Decode the screenshots "as we go" while edge swiping. r=aus
(cherry picked from commit 76122f7ba317cf2aa7a091cb4512ca8ce69335b9)

Conflicts:
	apps/system/js/app_window.js
	apps/system/test/unit/app_window_test.js
Revert "Bug 1058288 - [PDF Viewer] Update pdf.js to version 1.0.696"
Bug 1078156 - Disable intermittent test_a11y_keyboard_word_suggestions.py a=test-only
Bug 1066830 - Hide theme menu if there is no certified theme app
Bug 1075011 - Swap browser app for search app on old homescreen
Bug 1075200 - [Settings] Unable to set AM/PM time after change time format
Bug 1080611 - [Usage][Cost Control] The amount of data shown in Usage Settings and the chart differ
Bug 1079479 - [Usage][Cost Control] Remove incorrect message from Mobile App Usage list when Mobile usage is unchecked
Bug 1069500 - Promote permission dialog to on top of attention window
bug 1081346 - Update status appearance on activity termination. r=alive
Bug 1080479 - [Usage] By application totals are not reset
Bug 1081764 - [Bookmark] Save bookmark on enter press r=crdlc
Bug 1081764 - [Collection] Save collection on enter press r=crdlc
Bug 1042357 - Code to removeEventListener for radiostatechange in
radio.js is not working r=arthur.chen
Bug 1078202 - Switch topsites customiser to write places directly. r=kgrandon

Conflicts:
        apps/search/test/marionette/browser_test.js
Merge pull request #25065 from marshall/bug1071451_incomingCall_v2.1

Bug 1071451: [AUM] Handle attention windows properly so phone calls are counted
Bug 1080812 - Fixing performance test issue with screen timeouts