Merge changes Ia693f512,If3b7d41f

* changes:
  Enable elegant text metrics in Quantum theme
  Add elegantTextHeight text appearance attribute