Merge "Fix issue where scale-animating text would jump temporarily a few pixels" into jb-dev