Merge "Widget Picker - Always center add widget button text vertically" into main