Merge "Use a separate personal/work tabs layout for the widget picker" into sc-dev