LPS-32581 Avoid saving the selected color scheme of previously selected theme when changing themes