Merge "Fix signal color in dark mode" into sc-dev