Merge "Fix the text color in the highlighted expander" into sc-dev