Merge "Make sure fontScale in configuration sent to app is equal to global" into nyc-dev