Merge "Fix mismatched parameter of font scale change" into rvc-dev am: 5580360ba8 am: 2694d3ca71 am: 0d0f22372f

Change-Id: I302ce2742f35121f36c60ad0d7600abcedbcfe64