00bb74f330
Should be able to throw away some of the search controller stuff after Global Search is migrated
(cherry picked from commit 0225711f6f)