Merge "Add highlight API for search result range"