Merge "new font sizing strategy" into jb-ub-mail