Merge "Cleanup LARGE_SCREEN_WIDGET_PICKER flag" into main