Merge "Revert "Update component title color in Settings"" into main