Merge "Fix two pane widget picker bugs" into main