Handle yet another case of missing state-changed:focused events