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

Change-Id: I6f815a171e1b0ac0c5446e8c9f80d63ee3abfa09