Merge "Restore font scale to default in Settings_SystemTest" into nyc-dev