Merge "Match redlines for new ur8 layout." into jb-ub-mail-ur8