Revert "Temporarily disabling custom search controller"

This reverts commit 954b7d36b96190b5b81e1784aaa5bb40057a8bca.

Change-Id: If304fa164e50f68aac168ede0f4bc0ff97659a8a
1 file changed