Merge "Cherrypick search highlighting fix"