Merge "Default font scale is 1 if not otherwise specified" into nyc-dev