Merge "Make sure we update style spans for senders when there are config changes." into jb-ub-mail