Merge "Add subclass for two pane widget picker" into udc-dev