Merge "TextDecorator. Do not destroy the highlight geometry every OnRelayout." into...