Merge "Remove unused flag UNFOLDED_WIDGET_PICKER" into main