[DF-348] UI Editor. Fix for DF-710. UI changes for widgets.
Merge remote-tracking branch 'origin/UIEditor' into UIEditor