Merge "Properly scale text" into jb-mr2-dev