Merge "Support splitting from workspace with Widgets" into udc-dev