Revert "Avoid duplicate focus call for "html" type dialog field."

This reverts commit 47f8446b766444c55d2cb307264671b64132914d.
Another way to avoid duplicate focus call for "html" type dialog field.
Collapsed the fix to 1 LOC.
Changelog entry.
Merge branch 't/9845'