Merge "Don't show two pane widget picker in foldables." into udc-dev