Merge "Dark Theme "TURN ON UNTIL SUNRISE" is not retained after reboot"