Bug 1097359 - [Window Management]With the software home button option enabled, the button will get pushed out of place and the icons in the notifications bar will overlap when the user selects on the cookies link
Bug 1082938 - [Music] set play status to playing when play event fires
Merge pull request #26287 from cctuan/1097359-v21

Bug 1097359 - [Window Management]With the software home button option enabled, the button will get pushed out of place and the icons in the notifications bar will overlap when the user selects on the cookies link
Merge pull request #26351 from dominickuo/v2.1-bug-1082938-reland

Bug 1082938 - [Music] set play status to playing when play event fires, r=jimporter
Bug 1089951 - [Midori 2.0][Homescreen]The main interface menus overlap when MS quits games
Bug 1095617 - [Browser] Persona not working inside browser
Revert "Merge pull request #26046 from DouglasSherk/1093862-callscreen-ended-calls"

This reverts commit afdfa629be209dd53a1b7b6d6c95eab7077ffcd9.
Bug 1095805 - Test follow-up, fix app call for v2.1 r=kgrandon a=testonly
Bug 1078279 - Change test disable code to correct manifest file a=test-only r=me
Merge pull request #26412 from KevinGrandon/bug_1095805_test_follow_up

Bug 1095805 - Test follow-up, fix app call for v2.1 a=testonly
Bug 1104235 - Use LockscreenWindowManager instead of lib/lockscreen, r=kgrandon, a=test-only
Merge pull request #26422 from mikehenrty/bug-1104235-use-lockscreen-window-manager

Bug 1104235 - Use LockscreenWindowManager instead of lib/lockscreen
Bug 1104314 - Force hide keyboard during long press search app test, r=kgrandon, a=test-only
Bug 1097497 - Make sure utility tray is open before flicking closed, r=kgrandon, a=test-only
Merge pull request #26432 from mikehenrty/bug-1097497-wait-for-utility-tray-open

Bug 1097497 - Make sure utility tray is open before flicking closed, r=k...
Merge pull request #26426 from mikehenrty/bug-1104314-force-hide-keyboard

Bug 1104314 - Force hide keyboard during long press search app test, r=k...
Bug 1093862 - Make Callscreen not respond to user input while there are no currently handled calls. r=gtorodelvalle, r=thills
Revert "Merge pull request #26432 from mikehenrty/bug-1097497-wait-for-utility-tray-open"

This reverts commit 0bc12f8d582724ec3f911ec3da4507b562a05adc, reversing
changes made to 18e02f16972f9d54931d57b13f35d2a2c0eda683.
Merge pull request #25346 from KevinGrandon/bug_1085667_intermittent_ringtones_share_test

Bug 1085667 - [Music] Try clicking on share button mutliple times
Conflicts:
	apps/music/test/marionette/lib/music.js
Bug 1097497 - Make sure utility tray is fully opened before closing. r=kgrandon, a=test-only