More highlight drawing fixes.
Merge pull request #3346 from adobe/glenn/issue-3326

More highlight drawing fixes