Merge changes Ic7360019,I9b60657c

* changes:
  internal change
  Make dialpad key alignment responsive to font size.