Fix editor focus issues for CEF 2171

Squashed version that Fixes remaining issue for #9972