Merge "Set fontScale in override config to be equal to global." into nyc-dev