Merge branch '2919_widget_focus_refactoring'