Merge "Prevent two pane widget picker code from reaching foldables" into udc-dev