Merge "Reinstate widget picker size filter behind a flag." into main