Merge "Implement two pane widget picker" into tm-qpr-dev