Merge "Fix notification colors on theme change." into sc-dev