Merge "Add SearchResultCode to onSearchResult()" into tm-qpr-dev