am 7362e0d8: Merge "Adjust text sizes for better behavior under user scaling." into ics-mr0

* commit '7362e0d8fe6bd6739dbd22c2ad4c2c7fb0f7c1d4':
  Adjust text sizes for better behavior under user scaling.