Merge "Update SelectorWithWidgetPreference layout" into main