Merge change 24581 into eclair

* changes:
  Dialog titles would sometimes use a font too large.