LPS-32582 Fix Color Scheme selection to handle the device when it should use the default Color Scheme

Hi Dani,

I've refactored the fix as your requested. Please review it.

Regards,
Vilmos