Merge "Ensure that the title of SelectorWithWidgetPreference does not truncate" into main