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

Change-Id: I873140beb7892c329d614038163db84027c09e66