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