VE-1199: Prepend surface to target for more reliable initial FocusWidget...

... layout