Merge "Fix math issue when transforming text in perspective" into jb-mr2-dev