Merge "Account for text alignment in Op bounds calculation" into jb-mr2-dev