am 06136574: Merge changes Ia693f512,If3b7d41f

* commit '0613657426aecb7ed6141c133f100baf24166ae0':
  Enable elegant text metrics in Quantum theme
  Add elegantTextHeight text appearance attribute