Merge pull request #21136 from EverythingMe/1030194-sugg-brackets

Bug 1030194 - [Rocketbar] Search term will show brackets for searches that have the two of the same words or content
Merge pull request #20778 from KevinGrandon/bug_1027990_search_window_activities

Bug 1027990 - [System] ActivityWindow does not receive proper rearWindow
Conflicts:
	apps/search/js/contextmenu.js