Merge "Correct "cropping" of widget picker's search bar" into sc-dev