Merge "Update widget picker two pane to support foldables" into main