Merge "Update header text color when theme changes" into rvc-dev