Merge \"Make sure fontScale in configuration sent to app is equal to global\" into nyc-dev
am: 7c6692646c

Change-Id: I6b0cbd28de6108bd938d6e620e10b06cfaa86c45