Merge "Fixes issue that would switch dark mode off when in scheduled mode" into main