Merge "Update "Dark Theme" Settings screen to account for Modes that can toggle it" into main