Merge "[Settings] Fix color contrast on alert dialogs" into main