Merge "Revert "First round of visual refresh changes."" into jb-ub-mail-ur8