Merge "counteract jumping in CSS-based message zooming" into jb-ub-mail-ur8