Bug 1047469 - Follow-up to support search keyword highlighting for trimmed URLs r=dao