Merge \\\"Make sure fontScale in configuration sent to app is equal to...
Merge \\\"Make sure fontScale in configuration sent to app is equal to global\\\" into nyc-dev am: 7c669264 am: 168e07a6
am: ca6972f4
Change-Id: Ie6b9196e5bd9c6ada6eabcb9d74065834f065f37