Highlight drawing fixes.
Merge pull request #3333 from adobe/glenn/issue-3326

Fix #3326 - highlight drawing problems