Merge "Don't fail test if fontScale key is undefined" into nyc-mr1-dev