Merge "Do not expand when SettingsDropdownBox disabled" into main