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: 781c0e2a
am: d0a87b65
Change-Id: I025fdf51ed716ecbf0c65b774b52a5b93da17c7b