Merge "Calculator layout reworking to handle large text." into jb-dev