Merge "Fix flicker for widget picker" into main