Merge "Adding SpecialSearchResultsPrepend/Append hooks"