Merge "Fix bug where notification text colors stop updating"