Merge "Rename to SettingsDropdownBox" into main