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

* commit 'b8f3131893b85bb21aa43cfed867b42eb6301be6':
  Calculator layout reworking to handle large text.