[OE-4459] Fixed eyedraw reset

"Fixed", meaning, "restored back to how it works on 1.6".
Merge branch 'jira/OE-4459' into release/1.7